autoupdate via tl-update-messages

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

17 files changed, 4759 insertions, 4527 deletions

diff --git a/Master/tlpkg/translations/cs.po b/Master/tlpkg/translations/cs.po
index f45128af35a..d4942653314 100644
--- a/Master/tlpkg/translations/cs.po
+++ b/Master/tlpkg/translations/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2009-09-08 11:35+0100\n"
 "Last-Translator: Michal Madr <m.madr@seznam.cz>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -22,7 +22,7 @@ msgstr "Instalace TeX Live %s"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Ukončit"
 
@@ -95,8 +95,8 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 #, fuzzy
 msgid "Default remote repository"
 msgstr "Výchozí síťový zdroj balíků"
@@ -142,20 +142,21 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -196,18 +197,18 @@ msgstr "Cílová složka:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Změnit"
 
@@ -246,29 +247,32 @@ msgstr "Zadat cestu pro"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "OK"
 
@@ -287,9 +291,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Změna asociace typů souborů k programům"
 
@@ -338,9 +342,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Ano"
 
@@ -365,14 +369,14 @@ msgstr "Ano"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "Ne"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Nainstaluj"
 
@@ -397,15 +401,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Přidejte %s/texmf/doc/man do MANPATH.\n"
-"Přidejte %s/texmf/doc/info do INFOPATH.\n"
-"A to nejdůležitější: přidejte %s/bin/%s\n"
-"do vaší proměnné PATH pro toto i další sezení."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -426,17 +426,17 @@ msgstr "Dokončit"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Žádné"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Jen nové"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Všechny"
 
@@ -445,7 +445,7 @@ msgid "A4"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr ""
 
@@ -457,15 +457,15 @@ msgstr "Nahrát"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Varování"
 
@@ -531,11 +531,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Přepnout"
 
@@ -560,7 +560,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (adresář pro uživatelské soubory)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Volby"
 
@@ -679,7 +679,7 @@ msgid "Select arch-os"
 msgstr "Vybrat architekturu a OS"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 #, fuzzy
 msgid "Removals of the main platform not possible!"
 msgstr "Odstranění hlavní architektury není možné!"
@@ -714,21 +714,21 @@ msgid ""
 "Directories have been reinitialized"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -744,272 +744,273 @@ msgstr ""
 "\n"
 "Většina tlačítek bude zakázána."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 #, fuzzy
 msgid "Load default"
 msgstr "Nový výchozí zdroj balíků"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 #, fuzzy
 msgid "Loaded repository:"
 msgstr "Nový zdroj balíků:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 #, fuzzy
 msgid "none"
 msgstr "Žádné"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 #, fuzzy
 msgid "Display configuration"
 msgstr "Konfigurace"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 #, fuzzy
 msgid "all"
 msgstr "Všechny"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 #, fuzzy
 msgid "installed"
 msgstr "Nainstaluj"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 #, fuzzy
 msgid "not installed"
 msgstr "Nainstaluj"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 #, fuzzy
 msgid "updates"
 msgstr "Aktualizovat"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 #, fuzzy
 msgid "packages"
 msgstr "Vybrat balíky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 #, fuzzy
 msgid "collections"
 msgstr "Standardní kolekce"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 #, fuzzy
 msgid "descriptions"
 msgstr "(není dostupný žádný popis)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 #, fuzzy
 msgid "Selection"
 msgstr "Nové umístění:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 #, fuzzy
 msgid "selected"
 msgstr "Aktualizovat vybrané"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 #, fuzzy
 msgid "not selected"
 msgstr "Instalovat vybrané"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 #, fuzzy
 msgid "Select all"
 msgstr "Vybrat vše"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 #, fuzzy
 msgid "Select none"
 msgstr "Vybrat vše"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 #, fuzzy
 msgid "Reset filters"
 msgstr "Vrátit změny"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 #, fuzzy
 msgid "Package name"
 msgstr "Vybrat balíky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 #, fuzzy
 msgid "Short description"
 msgstr "(není dostupný žádný popis)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 #, fuzzy
 msgid "Update all installed"
 msgstr "Aktualizovat vše"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 #, fuzzy
 msgid "Reinstall previously removed packages"
 msgstr "Vybrat balíky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Odstranit"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 #, fuzzy
 msgid "Backup"
 msgstr "< Předcházející"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Akce"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 #, fuzzy
 msgid "Load default repository:"
 msgstr "Nový výchozí zdroj balíků"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 #, fuzzy
 msgid "Load cmd line repository:"
 msgstr "Nový zdroj balíků:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 #, fuzzy
 msgid "Load default net repository:"
 msgstr "Nový výchozí zdroj balíků"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 #, fuzzy
 msgid "Load other repository ..."
 msgstr "Nový zdroj balíků:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 #, fuzzy
 msgid "General ..."
 msgstr "Nastavení papíru"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 #, fuzzy
 msgid "Expert options"
 msgstr "Nastavení papíru"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 #, fuzzy
 msgid "Update filename database"
 msgstr "Aktualizovat databázi map fontů (font map)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 #, fuzzy
 msgid "Rebuild all formats"
 msgstr "Znovu vytvořit všechny formáty"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Aktualizovat databázi map fontů (font map)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 #, fuzzy
 msgid "Handle symlinks in system dirs"
 msgstr "Vytvořit symbolické linky v systémových adresářích"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, fuzzy, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Odstranit TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Odstranit TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, fuzzy, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1018,297 +1019,298 @@ msgstr ""
 "Opravdu smazat celou instalaci TeX Live %s?\n"
 "Toto je vaše poslední možnost rozmyslet si tuto akci!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "O programu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 #, fuzzy
 msgid "Package:"
 msgstr "Vybrat balíky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 #, fuzzy
 msgid "Short description:"
 msgstr "(není dostupný žádný popis)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 #, fuzzy
 msgid "Long description:"
 msgstr "(není dostupný žádný popis)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 #, fuzzy
 msgid "Installed:"
 msgstr "Nainstaluj"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 #, fuzzy
 msgid "Collection:"
 msgstr "Standardní kolekce"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 #, fuzzy
 msgid "Further information"
 msgstr "Další přizpůsobení"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 #, fuzzy
 msgid "Select platforms to support"
 msgstr "Vybrat podporované architektury"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Aplikovat změny"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 #, fuzzy
 msgid "General options"
 msgstr "Nastavení papíru"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Výchozí zdroj balíků"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Vytvoř formátové soubory"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Nainstaluj zdrojové soubory maker/fontů"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Nainstaluj dokumentaci maker/fontů"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Výchozí adresář pro zálohy"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Nastavení automatického zálohování"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Cíl linku pro programy"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Cíl linku pro dokumentaci"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Cíl linku pro \"manové\" stránky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Nainstaluj pro všechny uživatele"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 #, fuzzy
 msgid "Paper options"
 msgstr "Nastavení papíru"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Výchozí papír pro vše"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Výchozí papír pro"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Vybrat adresář"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Výběr papíru pro"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "Uchovávat libovolně mnoho"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "zakázat"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Instalace"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
 "Please restart if necessary."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1319,12 +1321,12 @@ msgid ""
 "Then you can restart the program for further updates."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1332,68 +1334,68 @@ msgstr ""
 "Až program skončí, chvíli prosím počkejte, aby aktualizace mohla být "
 "dokončena."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 #, fuzzy
 msgid "Restore completed"
 msgstr "Instalace kompletně odstraněna"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 #, fuzzy
 msgid "Restore selected package"
 msgstr "Vybrat balíky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Aktualizuj symbolické linky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Smaž symbolické linky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 #, fuzzy
 msgid "Load package repository"
 msgstr "Změnit zdroj balíků"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 #, fuzzy
 msgid "Package repository:"
 msgstr "Nový zdroj balíků:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Výchozí síťový zdroj balíků"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1778,6 +1780,17 @@ msgstr ""
 msgid "XeTeX packages"
 msgstr ""
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Přidejte %s/texmf/doc/man do MANPATH.\n"
+#~ "Přidejte %s/texmf/doc/info do INFOPATH.\n"
+#~ "A to nejdůležitější: přidejte %s/bin/%s\n"
+#~ "do vaší proměnné PATH pro toto i další sezení."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Vytvoř zkratky v menu a na ploše"
 
diff --git a/Master/tlpkg/translations/de.po b/Master/tlpkg/translations/de.po
index 62f5e205b58..98ea0d0e8b0 100644
--- a/Master/tlpkg/translations/de.po
+++ b/Master/tlpkg/translations/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2013-03-22 08:09+0100\n"
 "Last-Translator: Uwe Ziegenhagen <ziegenhagen@gmail.com>\n"
 "Language-Team: TL German Translation Team <tex-live@tug.org>\n"
@@ -23,7 +23,7 @@ msgstr "TeX Live %s Installation"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Beenden"
 
@@ -79,7 +79,8 @@ msgstr "Oder nutzen sie die install-tl-advanced.bat."
 
 #: tlpkg/installer/install-menu-wizard.pl:197
 msgid "Or specify  --gui expert  to install-tl."
-msgstr "Oder geben Sie die Option '--gui expert' beim Aufruf von install-tl an."
+msgstr ""
+"Oder geben Sie die Option '--gui expert' beim Aufruf von install-tl an."
 
 #: tlpkg/installer/install-menu-wizard.pl:206
 msgid "Change default repository"
@@ -102,8 +103,8 @@ msgstr "Netzwerkquellen"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Voreingestellte Netzwerkinstallationsquelle"
 
@@ -148,21 +149,21 @@ msgstr "Dies kann etwas Zeit beanspruchen!"
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Abbruch"
 
@@ -207,18 +208,18 @@ msgstr "Zielverzeichnis:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Ändern"
 
@@ -238,7 +239,8 @@ msgstr "Benötigter Festplattenplatz:"
 #: tlpkg/installer/install-menu-wizard.pl:503
 #: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
-msgstr "(Standardverzeichnis nicht zugänglich oder beschreibbar - bitte ändern)"
+msgstr ""
+"(Standardverzeichnis nicht zugänglich oder beschreibbar - bitte ändern)"
 
 #: tlpkg/installer/install-menu-wizard.pl:513
 msgid "Enter path for"
@@ -256,32 +258,32 @@ msgstr "Bitte geben Sie den Pfad ein für"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239
-#: texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616
-#: texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636
-#: texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "Ok"
 
@@ -299,9 +301,9 @@ msgstr "Füge Menüeinträge hinzu"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Anpassen der Datei-Verknüpfungen"
 
@@ -350,9 +352,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Ja"
 
@@ -377,14 +379,14 @@ msgstr "Ja"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "Nein"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Installation"
 
@@ -393,28 +395,31 @@ msgstr "Installation"
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
-"The 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."
+"The 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."
 msgstr ""
-"Für einen Überblick der verfügbaren Dokumentation lesen Sie bitte %s/index.html.\n"
+"Für einen Überblick der verfügbaren Dokumentation lesen Sie bitte %s/index."
+"html.\n"
 "Die Webseite des TeX Live Projektes (http://tug.org/texlive/)\n"
 "informiert über Updates und Korrekturen.\n"
 "\n"
-"TeX Live ist ein gemeinsames Projekt verschiedener TeX Benutzer Gruppen aus aller Welt;\n"
-"durch einen Beitritt in eine dieser Gruppen können Sie TeX Live aktiv unterstützen.Eine Liste der Gruppen können Sie im Internet auf http://tug.org/usergroups.html finden."
+"TeX Live ist ein gemeinsames Projekt verschiedener TeX Benutzer Gruppen aus "
+"aller Welt;\n"
+"durch einen Beitritt in eine dieser Gruppen können Sie TeX Live aktiv "
+"unterstützen.Eine Liste der Gruppen können Sie im Internet auf http://tug."
+"org/usergroups.html finden."
 
 #: tlpkg/installer/install-menu-wizard.pl:742
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Bitte fügen Sie %s/texmf/doc/man zum MANPATH und\n"
-"%s/texmf/doc/info zum INFOPATH hinzu.\n"
-"Am wichtigsten, fügen Sie %s/bin/%s\n"
-"zu Ihrem PATH für die aktuelle und zukünftige Sitzungen hinzu."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -437,17 +442,17 @@ msgstr "Ende"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Gar nicht"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Nur neue"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Alle"
 
@@ -456,7 +461,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "Letter"
 
@@ -468,15 +473,15 @@ msgstr "Laden"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Warnung"
 
@@ -487,12 +492,14 @@ msgstr "Bitte einen anderen Spiegelserver wählen!"
 #: tlpkg/installer/install-menu-perltk.pl:309
 #, perl-format
 msgid ""
-"The TeX Live versions of the local installation and the repository being accessed are not compatible:\n"
+"The TeX Live versions of the local installation and the repository being "
+"accessed are not compatible:\n"
 "  local: %s\n"
 "  repository: %s\n"
 "Please select a different mirror."
 msgstr ""
-"DIe TeX Live Versionen der lokalen Installation und der benutzten Installationsquelle stimmen nicht überein:\n"
+"DIe TeX Live Versionen der lokalen Installation und der benutzten "
+"Installationsquelle stimmen nicht überein:\n"
 "  lokal: %s\n"
 "  Installationsquelle: %s\n"
 "Bitte anderen Spiegelserver auswählen."
@@ -545,11 +552,11 @@ msgstr "Portable Installation"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Ändern"
 
@@ -574,7 +581,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (Eigene Makro-Pakete)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Optionen"
 
@@ -624,7 +631,8 @@ msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
 msgstr ""
-"Rechtsklicken Sie install-tl-advanced und wählen Sie \"Als Administrator ausführen\"\n"
+"Rechtsklicken Sie install-tl-advanced und wählen Sie \"Als Administrator "
+"ausführen\"\n"
 "wenn Sie für alle Benutzer installieren möchten."
 
 #: tlpkg/installer/install-menu-perltk.pl:578
@@ -696,7 +704,7 @@ msgid "Select arch-os"
 msgstr "Auswahl der Architekturen"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "Entfernen der Hauptarchitekturen ist nicht möglich!"
 
@@ -732,7 +740,7 @@ msgstr ""
 "Option der portablen Installation wurde verändert;\n"
 "Verzeichnisse wurden reinitialisiert"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
@@ -740,15 +748,15 @@ msgstr ""
 "Lade die lokale TeX Live Datenbank;\n"
 "bitte warten..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "Laden der Taxonomiedatei fehlgeschlagen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr "fertig geladen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -759,246 +767,247 @@ msgid ""
 msgstr ""
 "Sie haben keine Berechtigung die Installation zu verändern,\n"
 "insbesonders ist der Ordner %s nicht schreibbar.\n"
-"Bitte starten Sie dieses Programm als Administrator, oder kontaktieren Sie den lokalen Administrator.\n"
+"Bitte starten Sie dieses Programm als Administrator, oder kontaktieren Sie "
+"den lokalen Administrator.\n"
 "\n"
 "Die meisten Schaltflächen werden deaktiviert."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "Laden der voreingestellten Installationsquelle"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Geladene Installationsquelle:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "keine"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Anzeigeeigenschaften"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Status"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305
-#: texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "Alle"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "installierte"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "nicht installierte"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "zu aktualisierende"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Kategorie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "Paketen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "Paketgruppen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "Schemata"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "Treffer"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "Kurzbeschreibungen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "Taxonomien"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "Dateinamen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Auswahl"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "selektierte"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "nicht selektierte"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Alle anwählen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "Alle abwählen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Filter zurücksetzten"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Paketname"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Lokale rev. (vers.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Server rev. (vers.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Kurzbeschreibung"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Aktualisieren aller Pakete"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Neuinstallation von vormals entfernten Paketen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Entfernen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Backup"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Aktionen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Hilfe"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "Multiple Quellen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Laden der voreingestellten Installationsquelle"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Laden der Kommandozeilen-Installationsquelle:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Laden der voreingestellten Netzwerkinstallationsquelle:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Laden einer anderen Installationsquelle ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Allgemein ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Papierformat ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "Architekturen ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "GUI Sprache ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Experten Optionen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Debug-Ausgabe"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Auto-Installation von Paketen abschalten"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "Auto-Entfernung von Paketen abschalten"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Neuerstellung der Dateilisten (ls-R)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Alle Formatdateien neu erstellen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Font Datenbank erneuern (updmap-sys)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Gesicherte Pakete wiederherstellen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Verwaltung der symbolischen Links"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "TeX Live %s entfernen ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "TeX Live %s entfernen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr "Komplette Deinstallation fertig!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1007,282 +1016,283 @@ msgstr ""
 "Wollen Sie TeX Live %s wirklich komplett entfernen?\n"
 "Es werden keine weiteren Rückfragen gestellt!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Dokumentation"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633
-#: texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "Über TeX Live Manager (tlmgr)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Details für:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Paket:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Kurzbeschreibung:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Ausführliche Beschreibung:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Installiert:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Lokale Revision:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Lokale Catalogue Version:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Serverrevision:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Version des Server-Katalogs:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Schlüsselwörter:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "Funktionalität:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "Primäre Charakterisierung:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "Sekundäre Charakterisierung:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Paketgruppe:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
-msgstr "Warnung: Die Katalog-Versionen können veraltet oder einfach falsch sein."
+msgstr ""
+"Warnung: Die Katalog-Versionen können veraltet oder einfach falsch sein."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Abhängigkeiten:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Abhängigkeiten auf Binärpakete:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Laufzeitdateien:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Dokumentationsdateien:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Quelldateien:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Binärdateien:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Weitere Informationen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "Auswahl der zu unterstützenden Architekturen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Änderungen anwenden"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Allgemeine Optionen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Voreingestellte Installationsquelle"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Formatdateien werden bei der Installation erstellt"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Installation der Macro/Font-Quellen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Installation der Macro/Font-Dokumentation"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Voreingestellter Backup-Ordner"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Auto backup Einstellungen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Symbolische Link für Programme nach"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Symbolische Links für info Seiten nach"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Symbolische Links für man Seiten nach"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Install for all users"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Papierformat-Einstellungen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Voreingestelltes Papierformat für alle Programme"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "A4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Voreingestelles Papierformat für"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "GUI Sprache"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "systemweiter Standard"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Standardsprache für die GUI:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "Änderungen werden erst nach einem Neustart wirksam"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Auswahl eines Ordners"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Editiere Standard-Quellen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr "Geben Sie die zu nutzenden Quellen an"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Löschen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr "Ändere das Haupt-Repository"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr "Ändere das Tochter-Repository"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Füge Quelle hinzu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Füge Paket-Quelle hinzu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr "Das Namens-Tag dieses Repositories wird schon genutzt: %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Mache rückgängig"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Papierformat für"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "behalten von beliebig vielen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "keine backups"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr "Das Laden der nicht-lokalen Datenbank schlug fehl."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr "Fehlermeldung:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Installation"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1292,89 +1302,97 @@ msgstr ""
 "Programm wird beendet.\n"
 "Bitte nochmals starten falls notwendig."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
-"Please select \"Update all installed\" button after dismissing this dialogue.\n"
+"Please select \"Update all installed\" button after dismissing this "
+"dialogue.\n"
 "\n"
 "The program will terminate after the update.\n"
 "Then you can restart the program for further updates."
 msgstr ""
 "Updates für den TeX Live Manager (tlmgr) sind verfügbar.\n"
-"Die Installation von Updates funktioniert nicht ohne Upgrade auf die neue Version.\n"
+"Die Installation von Updates funktioniert nicht ohne Upgrade auf die neue "
+"Version.\n"
 "Bitte wählen Sie \"Update all installed\" nach Beendigung dieses Dialogs.\n"
 "\n"
 "Das Programm wird nach dem Update beendet.\n"
 "Dann können Sie es für weitere Updates neu starten."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
-msgstr "Zumindest %s weitere Updates sind verfügbar nachdem tlmgr aktualisiert wurde."
+msgstr ""
+"Zumindest %s weitere Updates sind verfügbar nachdem tlmgr aktualisiert wurde."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
-msgid "Please wait a bit after the program has terminated so that the update can be completed."
-msgstr "Bitte warten Sie etwas nachdem sich das Programm beendet hat, damit die Aktualisierungen durchgeführt werden können."
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
+msgid ""
+"Please wait a bit after the program has terminated so that the update can be "
+"completed."
+msgstr ""
+"Bitte warten Sie etwas nachdem sich das Programm beendet hat, damit die "
+"Aktualisierungen durchgeführt werden können."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Wiederherstellung abgeschlossen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
-msgstr "Auswahl des wiederherzustellenden Pakets, oder alle Pakete wiederherstellen"
+msgstr ""
+"Auswahl des wiederherzustellenden Pakets, oder alle Pakete wiederherstellen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Revision:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Ausgewähltes Paket wiederherstellen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Alle Pakete auf den letzten gesicherten Stand bringen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Schließen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Symbolische Links erneuern"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Symbolische Links entfernen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Bearbeite Pfad"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Neuer Wert für"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Laden der Installationsquelle"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Installationsquelle:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Voreingestellter Netzwerkinstallationsquelle"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Fertig"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1737,7 +1755,8 @@ msgstr "PSTricks Pakete"
 
 #: tlpkg/translations/shortdesc.pl:89
 msgid "Support for publishers, theses, standards, conferences, etc."
-msgstr "Unterstützung für Verleger, Abschlussarbeiten, Standards, Konferenzen, etc."
+msgstr ""
+"Unterstützung für Verleger, Abschlussarbeiten, Standards, Konferenzen, etc."
 
 #: tlpkg/translations/shortdesc.pl:90
 msgid "Typesetting for natural and computer sciences"
@@ -1759,6 +1778,17 @@ msgstr "Windows-spezifische Hilfsprogramme"
 msgid "XeTeX packages"
 msgstr "XeTeX Pakete"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Bitte fügen Sie %s/texmf/doc/man zum MANPATH und\n"
+#~ "%s/texmf/doc/info zum INFOPATH hinzu.\n"
+#~ "Am wichtigsten, fügen Sie %s/bin/%s\n"
+#~ "zu Ihrem PATH für die aktuelle und zukünftige Sitzungen hinzu."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Systemintegration"
 
diff --git a/Master/tlpkg/translations/es.po b/Master/tlpkg/translations/es.po
index 19a7eee47f1..d109271dfd7 100644
--- a/Master/tlpkg/translations/es.po
+++ b/Master/tlpkg/translations/es.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2010-08-23 12:05+0200\n"
 "Last-Translator: motitos <cullero@gmail.com>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -24,7 +24,7 @@ msgstr "Instalación de TeX Live %s"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Salir"
 
@@ -97,8 +97,8 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Repositorio de paquetes por defecto"
 
@@ -143,20 +143,21 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -197,18 +198,18 @@ msgstr "Ruta de instalación:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Cambiar"
 
@@ -247,29 +248,32 @@ msgstr "Introduzca la ruta para"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -287,9 +291,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Cambiar asociaciones de archivos"
 
@@ -338,9 +342,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Sí"
 
@@ -365,14 +369,14 @@ msgstr "Sí"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "No"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Instalar"
 
@@ -397,15 +401,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Añada %s/texmf/doc/man a MANPATH.\n"
-"Añada %s/texmf/doc/info a INFOPATH.\n"
-"Y en especial,añada %s/bin/%s\n"
-"a su ruta (PATH) para sus sesiones actual y futuras."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -426,17 +426,17 @@ msgstr "Terminar"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Ninguna"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Sólo nuevas"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Todas"
 
@@ -445,7 +445,7 @@ msgid "A4"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "carta"
 
@@ -457,15 +457,15 @@ msgstr "Cargar"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Advertencia"
 
@@ -531,11 +531,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Cambiar (sí/no)"
 
@@ -560,7 +560,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (directorio de ficheros personales del usuario)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Opciones"
 
@@ -678,7 +678,7 @@ msgid "Select arch-os"
 msgstr "Seleccionar arquitectura-sistema operativo"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
@@ -712,21 +712,21 @@ msgid ""
 "Directories have been reinitialized"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -742,241 +742,242 @@ msgstr ""
 "\n"
 "La mayoría de los botones e"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Repositorio cargado:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "ninguno"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Mostrar configuración"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Estatus"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "todo(s)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "instalado(s)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "no instalado(s)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "actualizaciones"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Categoría"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "paquetes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "colecciones"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "esquemas"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "Buscar"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Selección"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "seleccionado"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "no seleccionado"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Seleccionar todo(s)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "No seleccionar ninguno"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Reiniciar filtros"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Nombre del paquete"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Rev. local (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Rev. remota (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Descripción breve"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Actualizar todo lo instalado"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Reinstalar paquetes previamente eliminados"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Actualizar"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Eliminar"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Copia de seguridad"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Acciones"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Ayuda"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Cargar repositorio por defecto:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Cargar repositorio por línea de comandos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Cargar repositorio en línea predefinido"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Cargar otro repositorio..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "General..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Papel"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Opciones avanzadas"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Permitir salida de depuración"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Deshabilitar la autoinstalación de nuevos paquetes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "Deshabilitar auto-eliminación de paquetes borrados del servidor"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Actualizar la base de datos de nombres de ficheros"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Reconstruir todos los formatos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Actualizar la base de datos de mapas de fuentes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Restuarar paquetes de la copia de seguridad"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Administrar enlaces simbólicos en directorios de sistema"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Eliminar Tex Live %s ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Eliminar Tex Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -985,290 +986,291 @@ msgstr ""
 "¿De veras quiere eliminar (desinstalar) completamente Tex Lilve %s ?\n"
 "¡Esta es su última oportunidad para cambiar de opinión!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Manual"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "Acerca de"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Detalles en:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Paquete:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Categoría:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Descripción corta:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Descripción detallada"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Instalado:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Revisión local:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Versión del catálogo local:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Revisión remota:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Versión del catálogo remoto:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Colección:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 "Advertencia: las versiones de los catálogos pueden estar obsoletas o "
 "equivocadas."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Depende de:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Dependencias de los ejecutables:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Ficheros para ejecutar:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Documentación:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Ficheros fuentes:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Ficheros ejecutables:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Más información"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Llevar a cabo los cambios"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Opciones generales"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Repositorio de paquetes por defecto"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Crear formatos durante la instalación"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Instalar fuentes de macros/tipos de letra"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Instalar documentación de macros/tipos de letra"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Directorio de copia de seguridad por defecto"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Configuración de la copia de seguridad automática"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Destino de los enlaces a programas"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Destino de los enlaces a documentación"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Destino de los enlaces a páginas de manual"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Instalar para todos los usuarios"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Opciones de papel"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Papel por defecto para todos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "A4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Papel por defecto para"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "Los cambios se llevarán a cabo tras reiniciar"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Elija un directorio"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Seleccionar formato de papel para"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "mantener tantos como se quiera"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "deshabilitar"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Instalación"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
 "Please restart if necessary."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1279,14 +1281,14 @@ msgid ""
 "Then you can restart the program for further updates."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr ""
 "Hay disponibles al menos otras %s actualizaciones tras la actualización de "
 "tlmgr."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1294,64 +1296,64 @@ msgstr ""
 "Por favor, espere un poco después de que el programa haya terminado, para "
 "que la actualización se complete."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Recuperación completada"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Seleccione el paquete a restaurar, o restaure todos los paquetes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Revisión:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Restaurar paquete seleccionado"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Restaurar todos los paquetes a la versión más reciente"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Cerrar"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Actualizar enlaces simbólicos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Eliminar enlaces simbólicos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Cargar repositorio de paquetes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Repositorio de paquetes:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Repositorio de paquetes remoto por defecto"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Completado"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1736,6 +1738,17 @@ msgstr ""
 msgid "XeTeX packages"
 msgstr ""
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Añada %s/texmf/doc/man a MANPATH.\n"
+#~ "Añada %s/texmf/doc/info a INFOPATH.\n"
+#~ "Y en especial,añada %s/bin/%s\n"
+#~ "a su ruta (PATH) para sus sesiones actual y futuras."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Crear enlaces en el menú y en el escritorio"
 
diff --git a/Master/tlpkg/translations/fr.po b/Master/tlpkg/translations/fr.po
index c90c8179f98..26a1889fe00 100644
--- a/Master/tlpkg/translations/fr.po
+++ b/Master/tlpkg/translations/fr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-06-09 12:06+0200\n"
 "Last-Translator: Manuel Pégourié-Gonnard <mpg@elzevir.fr>\n"
 "Language-Team: Français <texlive@tug.org>\n"
@@ -26,7 +26,7 @@ msgstr "Installation de TeX Live %s"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Quitter"
 
@@ -106,8 +106,8 @@ msgstr "Dépôts de paquets en ligne"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Dépôt de paquets en ligne par défaut"
 
@@ -154,20 +154,21 @@ msgstr "Ceci peut prendre du temps."
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -212,18 +213,18 @@ msgstr "Répertoire de destination :"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Modifier"
 
@@ -261,29 +262,32 @@ msgstr "Entrer le chemin"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "Ok"
 
@@ -301,9 +305,9 @@ msgstr "Ajouter des raccourcis au menu"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Modifier les associations de fichiers"
 
@@ -352,9 +356,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Oui"
 
@@ -379,14 +383,14 @@ msgstr "Oui"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "Non"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Installer"
 
@@ -412,15 +416,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Veuillez ajouter %s/texmf/doc/man à votre MANPATH\n"
-"et %s/texmf/doc/info à votre INFOPATH,\n"
-"mais surtout, ajoutez %s/bin/%s\n"
-" à votre PATH, pour cette session et les prochaines."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -443,17 +443,17 @@ msgstr "Terminer"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Aucun"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Seulement les nouveaux"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Tous"
 
@@ -462,7 +462,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "letter"
 
@@ -474,15 +474,15 @@ msgstr "Charger"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Avertissement"
 
@@ -553,11 +553,11 @@ msgstr "Options de portabilité"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Basculer"
 
@@ -582,7 +582,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (répertoire des fichiers personnels)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Options"
 
@@ -705,7 +705,7 @@ msgid "Select arch-os"
 msgstr "Choisir la plate-forme"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "Il n'est pas possible de retirer l'architecture principale !"
 
@@ -741,7 +741,7 @@ msgstr ""
 "Option 'portable' modifiée :\n"
 "Les chemins d'installation ont été réinitialisés."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
@@ -749,15 +749,15 @@ msgstr ""
 "Chargement de la base TeX Live locale en cours ;\n"
 "ceci peut prendre du temps, veuillez patienter..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "Échec du chargement du fichier de taxonomie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr "... chargement terminé."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -772,241 +772,242 @@ msgstr ""
 "administrateur local.\n"
 "La plupart des boutons seront désactivés."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "Charger le dépôt par défaut :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Dépôt chargé :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "Aucun"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Afficher la configuration"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Statut"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "Tous"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "Installés"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "Non installés"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "Mises à jour"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Catégorie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "Paquets"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "Collections"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "Schémas"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "Recherche"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "Descriptions"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "taxonomies"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "Noms de fichiers"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Sélection"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "Paquets sélectionnés"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "Paquets non sélectionnés"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "Tout désélectionner"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Annuler les filtres"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Nom du paquet"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Version locale"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Version du dépôt"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Description courte"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Mettre à jour tous les paquets installés"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Réinstaller les paquets précédemment supprimés"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Supprimer"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Sauvegarde"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Actions"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Aide"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "plusieurs dépôts de paquets"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Charger le dépôt par défaut :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Charger le dépôt indiqué en ligne de commande :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Charger le dépôt en ligne par défaut :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Charger un autre dépôt..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Options générales..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Papier..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "Plate-formes..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "Langue pour l'interface graphique ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Mode expert"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Activer les information de déboguage"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Désactiver l'installation automatique des nouveaux paquets"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "Désactiver la suppression automatique des paquets supprimés du dépôt"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Mettre à jour l'index de fichiers"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Régénérer tous les formats"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Mettre à jour la base d'associations de fontes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Restaure une version sauvegardée des paquets"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Gérer les liens symboliques dans les répertoires systèmes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Désinstaller TeX Live %s..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Désinstaller TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr "Désinstallation complète terminée."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1015,283 +1016,284 @@ msgstr ""
 "Voulez-vous vraiment supprimer toute l'installation TeX Live %s ?\n"
 "On ne vous le demandera pas deux fois !"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Manuel"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "À propos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Détails sur :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Paquet : "
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Catégorie :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Description courte :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Description longue :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Installé :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Version locale :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Version locale d'après le catalogue :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Version du dépôts :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Version du dépôt d'après le catalogue :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Mots clefs :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "Fonctionalité :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "Caractérisation primaire :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "Caractérisation secondaire :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Collection : "
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 "Attention : la version d'après le catalogue peut être un peu en retard, "
 "voire totalement fausse."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Dépend de :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Dépend des paquets binaires :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Fichiers utilisés à l'exécution :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Fichiers de documentation :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Fichiers sources :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Fichiers exécutables :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Informations supplémentaires"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "Sélectionner les plate-formes utilisées"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Appliquer les changements"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Options générales"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Dépôt de paquets par défaut"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Créer tous les formats à l'installation"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Installer les sources des macros et des fontes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Installer les documentations des macros et des fontes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Répertoire par défaut pour les sauvegardes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Réglage des sauvegardes automatiques"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Destination des liens pour les programmes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Destination des liens pour les pages info"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Destination des liens pour les pages de man"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Installer pour tous les utilisateurs"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Réglages du papier"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Papier par défaut pour tous"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "a4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Papier par défaut pour"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "Langue pour l'interface graphique :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "valeur par défaut du système"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Langue par défaut pour l'interface graphique :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "Les modification ne seront actives qu'après redémarrage"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Choisir le répertoire"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Éditer les dépôts de paquets par défaut"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr "Spécifier une liste de dépôts à utiliser"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Supprimer"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr "Changer de dépôt de paquets principal"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr "Changer de dépôt de paquets secondaire"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Ajouter un dépôt"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Ajouter un dépôt de paquets"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr "Ce tag de dépôt de paquets est déjà utilisé : %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Revenir en arrière"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Sélectionner le format de papier pour"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "en garder autant que possible"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "désactiver"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr "Échec du chargement de la base de données distante"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr "Message d'erreur :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Installer"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1301,7 +1303,7 @@ msgstr ""
 "Le programme va maintenant s'arrêter.\n"
 "Veuillez le relancer si nécessaire."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1320,14 +1322,14 @@ msgstr ""
 "Le programme s'arrêtera après cette mise à jour.\n"
 "Vous pourrez le relancer ultérieurement pour d'autres mises à jour."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr ""
 "Après mise à jour de tlmgr, au moins %s mises à jour supplémentaires sont "
 "disponibles."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1335,64 +1337,64 @@ msgstr ""
 "Veuillez attendre un peu après la fin de l'exécution du programme pour que "
 "la mise à jour puisse se terminer."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Restauration effectuée."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Sélectionner le paquet à restaurer, ou restaurer tous les paquets"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Version :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Restaurer les paquets sélectionnés"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Restaurer tous les paquets à la version la plus récente"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Fermer"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Mettre à jour les liens symboliques"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Retirer les liens symboliques"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Éditer le répertoire"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Nouvelle valeur pour"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Charger le dépôt de paquets"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Dépôt de paquets :"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Dépôt de paquets en ligne par défaut"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Terminé"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1777,6 +1779,17 @@ msgstr "Programmes de support spécifique pour Windows"
 msgid "XeTeX packages"
 msgstr "Paquet XeTeX"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Veuillez ajouter %s/texmf/doc/man à votre MANPATH\n"
+#~ "et %s/texmf/doc/info à votre INFOPATH,\n"
+#~ "mais surtout, ajoutez %s/bin/%s\n"
+#~ " à votre PATH, pour cette session et les prochaines."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Créer des raccourcis dans le menu et sur le bureau"
 
diff --git a/Master/tlpkg/translations/it.po b/Master/tlpkg/translations/it.po
index 3a919678493..d6b8ae7b4b7 100644
--- a/Master/tlpkg/translations/it.po
+++ b/Master/tlpkg/translations/it.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tex Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-06-06 09:40+0100\n"
 "Last-Translator: Marco Pallante <marco.pallante@gmail.com>\n"
 "Language-Team: <>\n"
@@ -22,7 +22,7 @@ msgstr "Installazione di TeX Live %s"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Esci"
 
@@ -102,8 +102,8 @@ msgstr "ARCHIVI DI RETE"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Archivio di rete predefinito"
 
@@ -148,20 +148,21 @@ msgstr "Questa operazione può durare a lungo!"
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -206,18 +207,18 @@ msgstr "Percorso di destinazione:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Cambia"
 
@@ -256,29 +257,32 @@ msgstr "Inserisci il percorso per"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "Ok"
 
@@ -296,9 +300,9 @@ msgstr "Aggiungi le scorciatoie da menu"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Cambia le associazioni dei file"
 
@@ -347,9 +351,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Sì"
 
@@ -374,14 +378,14 @@ msgstr "Sì"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "No"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Installa"
 
@@ -407,16 +411,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Aggiungi %s/texmf/doc/man alla variabile MANPAH.\n"
-"Aggiungi %s/texmf/doc/info alla variabile INFOPATH.\n"
-"Per semplificare l'accesso ai programmi di TeX Live\n"
-"in questa sessione ed ai prossimi avvii,\n"
-"aggiungi %s/bin/%s alla tua variabile PATH."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -439,17 +438,17 @@ msgstr "Fine"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Nessuno"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Solo nuovi"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Tutti"
 
@@ -458,7 +457,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "lettera"
 
@@ -470,15 +469,15 @@ msgstr "Carica"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Attenzione"
 
@@ -549,11 +548,11 @@ msgstr "Allestimento portatile"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Inverti"
 
@@ -578,7 +577,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (directory dei file specifici per ciascun utente)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Opzioni"
 
@@ -702,7 +701,7 @@ msgid "Select arch-os"
 msgstr "Seleziona le combinazioni di architetture e sistemi operativi"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "Non è possibile rimuovere la piattaforma principale!"
 
@@ -738,7 +737,7 @@ msgstr ""
 "L'opzione portatile è cambiata;\n"
 "Le directory sono state reinizializzate"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
@@ -746,15 +745,15 @@ msgstr ""
 "Caricamento del database locale di TeX Live in corso;\n"
 "questa operazione può durare a lungo, attendere ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "Impossibile caricare il file della tassonomia"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr "... caricamento completo"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -770,241 +769,242 @@ msgstr ""
 "\n"
 "La maggior parte dei pulsanti sarà disabilitata."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "Carica predefinito"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Archivio caricato:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "nessuno"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Impostazioni di visualizzazione"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Stato"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "tutti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "installati"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "non installati"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "aggiornamenti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Categoria"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "pacchetti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "collezioni"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "schemi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "Cerca"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "descrizioni"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "tassonomie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "nomi dei file"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Selezione"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "selezionati"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "non selezionati"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Seleziona tutti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "Seleziona nessuno"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Reimposta filtri"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Nome pacchetto"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Rev. locale (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Rev. remota (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Descrizione breve"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Aggiorna installati"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Installa nuovamente i pacchetti rimossi in precedenza"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Aggiorna"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Backup"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Azioni"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Aiuto"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "archivi multipli"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Carica l'archivio predefinito:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Carica l'archivio tramite riga di comando:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Carica l'archivio remoto predefinito:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Carica un altro archivio ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Generale ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Carta ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "Piattaforme ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "Lingua Interfaccia Grafica ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Opzioni avanzate"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Abilita i messaggi di debug"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Impedisci l'installazione automatica di nuovi pacchetti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "Impedisci l'eliminazione automatica dei pacchetti rimossi dal server"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Aggiorna il database dei nomi dei file"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Crea nuovamente tutti i formati"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Aggiorna il database delle mappe dei font"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Ripristina i pacchetti dal backup"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Gestisci i collegamenti nelle directory di sistema"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Rimuovi TeX Live %s ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Rimozione di TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr "Rimozione totale completata"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1013,282 +1013,283 @@ msgstr ""
 "Vuoi davvero rimuovere l'intera installazione di TeX Live %s?\n"
 "Non saranno chieste ulteriori conferme!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Manuale"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "Informazioni"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Dettagli su: "
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Pacchetto:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Categoria:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Descrizione breve:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Descrizione lunga:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Installato:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Revisione locale:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Versione catalogo locale:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Revisione remota:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Versione catalogo remoto:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Parole chiave:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "Funzionalità"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "Caratterizzazione primaria:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "Caratterizzazione secondaria:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Collezione:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 "Attenzione: Le versioni del catalogo potrebbero essere obsolete o sbagliate."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Dipendenze:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Dipendenze eseguibili:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "File di runtime:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Documentazione:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Sorgenti:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Eseguibili:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Altre informazioni"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "Seleziona le piattaforme da supportare"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Applica le modifiche"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Opzioni generali"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Archivio predefinito dei pacchetti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Crea i formati durante l'installazione"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Installa i sorgenti per font e macro"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Installa la documentazione per font e macro"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Directory di backup predefinita"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Impostazioni per il backup automatico"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Destinazione dei collegamenti per i programmi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Destinazione dei collegamenti per le pagine info"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Destinazione dei collegamenti per le pagine di manuale"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Installazione per tutti gli utenti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Impostazioni carta"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Formato pagina predefinito per tutti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "a4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Formato pagina per"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "Lingua Interfaccia Grafica"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "Predefinito di sistema"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Lingua predefinita per l'interfaccia grafica:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "I cambiamenti avranno effetto dopo il riavvio"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Scegli una directory"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Modifica gli archivi predefiniti dei pacchetti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr "Specifica gli archivi da usare"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Elimina"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr "Cambia l'archivio principale dei pacchetti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr "Cambia l'archivio di riserva dei pacchetti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Aggiungi archivio"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Aggiungi archivio di pachetti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr "Nome del tag per l'archivio già usato: %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Ripristina"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Seleziona formato carta per"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "conserva un numero arbitrario di backup"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "disabilita"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr "Caricamento del database remoto fallito"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr "Messaggio d'errore:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Installazione"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1298,7 +1299,7 @@ msgstr ""
 "Il programma sarà ora terminato.\n"
 "Se è necessario, è possibile riavviarlo manualmente."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1316,14 +1317,14 @@ msgstr ""
 "Il programma verrà  terminato dopo l'aggiornamento.\n"
 "A quel punto sarà possibile riavviarlo per ulteriori aggiornamenti."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr ""
 "Dall'ultimo aggiornamento di tlmgr, sono disponibili almeno %s ulteriori "
 "aggiornamenti."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1331,64 +1332,64 @@ msgstr ""
 "Dopo che il programma abbia terminato, attendi qualche istante per "
 "consentire il completamento dell'aggiornamento."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Ripristino completato"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Seleziona i pacchetti da ripristinare oppure ripristinali tutti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Revisione:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Ripristina i pacchetti selezionati"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Ripristina tutti i pacchetti all'ultima versione"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Chiudi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Aggiorna i collegamenti simbolici"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Rimuovi i collegamenti simbolici"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Modifica directory"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Nuovo valore per "
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Carica archivio pacchetti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Archivio dei pacchetti:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Archivio dei pacchetti remoto predefinito"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Completato"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1773,6 +1774,18 @@ msgstr "Programmi di supporto per Windows"
 msgid "XeTeX packages"
 msgstr "Pacchetti XeTeX"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Aggiungi %s/texmf/doc/man alla variabile MANPAH.\n"
+#~ "Aggiungi %s/texmf/doc/info alla variabile INFOPATH.\n"
+#~ "Per semplificare l'accesso ai programmi di TeX Live\n"
+#~ "in questa sessione ed ai prossimi avvii,\n"
+#~ "aggiungi %s/bin/%s alla tua variabile PATH."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Crea i collegamenti nel menu e sul desktop"
 
diff --git a/Master/tlpkg/translations/ja.po b/Master/tlpkg/translations/ja.po
index 131669108bf..3acf3e518a1 100644
--- a/Master/tlpkg/translations/ja.po
+++ b/Master/tlpkg/translations/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-02-21 19:04+0900\n"
 "Last-Translator: Koji Yokota <yokota@res.otaru-uc.ac.jp>\n"
 "Language-Team: Japanese <lyx-doc@lyx.org>\n"
@@ -27,7 +27,7 @@ msgstr "TeX Live %s の導入"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "終了"
 
@@ -100,8 +100,8 @@ msgstr "ネットワークリポジトリ"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "既定リモートレポジトリ"
 
@@ -146,20 +146,21 @@ msgstr "これには少し時間がかかります！"
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "取消"
 
@@ -204,18 +205,18 @@ msgstr "導入先フォルダ:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "変更"
 
@@ -253,29 +254,32 @@ msgstr "右の変数のパスを入力→"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "OK"
 
@@ -293,9 +297,9 @@ msgstr "メニュー短絡キーを追加"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "ファイル関連付けを変更する"
 
@@ -344,9 +348,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "はい"
 
@@ -371,14 +375,14 @@ msgstr "はい"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "いいえ"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "導入"
 
@@ -403,15 +407,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"%s/texmf/doc/man を MANPATH に追加してください。\n"
-"%s/texmf/doc/info を INFOPATH に追加してください。\n"
-"特に、現セッションと今後のために、%s/bin/%s を\n"
-"PATH に追加してください。"
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -434,17 +434,17 @@ msgstr "終了"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "なし"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "新規のみ"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "全部"
 
@@ -453,7 +453,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "レター"
 
@@ -465,15 +465,15 @@ msgstr "読み込み"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "警告"
 
@@ -544,11 +544,11 @@ msgstr "可搬設定"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "入切"
 
@@ -573,7 +573,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME（ユーザ固有ファイル用ディレクトリ）"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "オプション"
 
@@ -691,7 +691,7 @@ msgid "Select arch-os"
 msgstr "arch-os を選択してください"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "主幹プラットフォームを取り除くことはできません！"
 
@@ -727,21 +727,21 @@ msgstr ""
 "可搬設定が変更されました\n"
 "ディレクトリも再初期化されます"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "分類ファイルを読み込みませんでした"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -757,241 +757,242 @@ msgstr ""
 "\n"
 "ほとんどのボタンは利用不能になります。"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "既定値を読み込む"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "読み込んだレポジトリ："
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "なし"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "表示設定"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "状態"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "すべて"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "導入済"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "未導入"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "更新"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "区分"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "パッケージ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "コレクション"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "スキーム"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "一致"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "説明"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "分類"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "ファイル名"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "選択"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "選択分"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "非選択分"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "すべて選択"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "すべて非選択"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "フィルタをリセット"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "パッケージ名"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "ローカル rev. (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "リモート rev. (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "簡単な説明"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "導入済のものをすべて更新"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "前回取り除いたパッケージを再導入"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "更新"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "取り除く"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "バックアップ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "作業"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "ヘルプ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "既定レポジトリの読み込み："
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "コマンドラインレポジトリの読み込み："
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "既定ネットレポジトリの読み込み："
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "他のレポジトリの読み込み..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "一般..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "用紙..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "アーキテクチャ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "GUI言語..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "熟練者用オプション"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "出力のデバッグを有効化"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "新規パッケージの自動導入を無効化"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "サーバから削除されたパッケージの自動削除を無効化"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "ファイル名データベースを更新"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "すべてのフォーマットを再構築"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "フォントマップデータベースを更新"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "バックアップからパッケージを復元"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "システムディレクトリでシンボリックリンクを取り扱う"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "TeX Live %s を取り除く..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "TeX Live %s を取り除く"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1000,282 +1001,283 @@ msgstr ""
 "導入済の TeX Live %s「全部」を本当に削除（アンインストール）しますか？\n"
 "取り止める最後のチャンスです！"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "取扱説明書"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "このプログラムについて"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "詳細:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "パッケージ:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "区分:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "簡単な説明:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "詳細な説明:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "導入済:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "ローカル Revision:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "ローカルカタログバージョン:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "リモート Revision:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "リモートカタログバージョン："
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "キーワード:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "機能性:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "第1設定:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "第2設定:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "コレクション:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 "警告： カタログバージョンが追いついていないか、間違っている可能性があります。"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "依存："
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "バイナリの依存："
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Run ファイル:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Doc ファイル:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Src ファイル:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Bin ファイル:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "詳細情報"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "サポートするアーキテクチャを選択してください"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "変更を適用"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "一般オプション"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "既定のパッケージレポジトリ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "導入時にフォーマットを作成する"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "macro および font ソースを導入する"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "macro および font 説明書を導入する"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "既定のバックアップディレクトリ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "自動バックアップ設定"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "プログラムのリンク先"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "info 文書のリンク先"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "man ページのリンク先"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "全ユーザ向けに導入する"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "用紙オプション"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "全体の既定用紙"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "Ａ４"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "既定用紙: 設定先 ="
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "GUI言語"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "システム既定値"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "GUI用の既定言語:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "変更は再起動後有効になります"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "ディレクトリを選択"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "用紙寸法を選択してください: 設定先 ="
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "任意の数を保持"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "無効"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "導入"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1285,7 +1287,7 @@ msgstr ""
 "直ちにプログラムを終了します。\n"
 "必要ならば再起動してください。"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1302,75 +1304,75 @@ msgstr ""
 "更新後、プログラムは終了します。\n"
 "他の更新を継続するには、プログラムを再起動してください。"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr "tlmgr の更新後、さらに少なくとも %s の更新が利用可能となっています。"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
 msgstr "プログラムが終了した後も、更新が完了するまでしばらくお待ちください。"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "復元が完了しました"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "復元するパッケージを選択するか、パッケージをすべて復元してください"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Revision:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "選択したパッケージを復元"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "全パッケージを最新バージョンへ復元"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "閉じる"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "シンボリックリンクを更新"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "シンボリックリンクを削除"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "パッケージリポジトリを読み込む"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "パッケージリポジトリ："
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "既定のネットレポジトリ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "完了"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1755,6 +1757,17 @@ msgstr "Windowsサポートプログラム"
 msgid "XeTeX packages"
 msgstr "XeTeXパッケージ"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "%s/texmf/doc/man を MANPATH に追加してください。\n"
+#~ "%s/texmf/doc/info を INFOPATH に追加してください。\n"
+#~ "特に、現セッションと今後のために、%s/bin/%s を\n"
+#~ "PATH に追加してください。"
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "メニューとデスクトップにショートカットを作成する"
 
diff --git a/Master/tlpkg/translations/messages.pot b/Master/tlpkg/translations/messages.pot
index 70696ca8f3c..4fb776c88c7 100644
--- a/Master/tlpkg/translations/messages.pot
+++ b/Master/tlpkg/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2010\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr ""
 
@@ -100,8 +100,8 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr ""
 
@@ -146,20 +146,21 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr ""
 
@@ -200,18 +201,18 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr ""
 
@@ -247,29 +248,32 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr ""
 
@@ -287,9 +291,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr ""
 
@@ -334,9 +338,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr ""
 
@@ -361,14 +365,14 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr ""
 
@@ -387,8 +391,8 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
@@ -412,17 +416,17 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr ""
 
@@ -431,7 +435,7 @@ msgid "A4"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr ""
 
@@ -443,15 +447,15 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr ""
 
@@ -517,11 +521,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr ""
 
@@ -546,7 +550,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr ""
 
@@ -664,7 +668,7 @@ msgid "Select arch-os"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
@@ -698,21 +702,21 @@ msgid ""
 "Directories have been reinitialized"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -722,529 +726,531 @@ msgid ""
 "Most buttons will be disabled."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
 "Your last chance to change your mind!"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
 "Please restart if necessary."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1255,75 +1261,75 @@ msgid ""
 "Then you can restart the program for further updates."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
diff --git a/Master/tlpkg/translations/nl.po b/Master/tlpkg/translations/nl.po
index b74b4bde959..206a06c3ed9 100644
--- a/Master/tlpkg/translations/nl.po
+++ b/Master/tlpkg/translations/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-06-03 16:47+0100\n"
 "Last-Translator: Siep Kroonenberg <siepo@cybercomm.nl>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -22,7 +22,7 @@ msgstr "TeX Live %s Installatie"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Stoppen"
 
@@ -101,8 +101,8 @@ msgstr "ONLINE INSTALLATIE-BRONNEN"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Standaard online installatie-bron"
 
@@ -147,20 +147,21 @@ msgstr "Dit gaat even duren!"
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Afbreken"
 
@@ -205,18 +206,18 @@ msgstr "Bestemmings-folder"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Wijzig"
 
@@ -254,29 +255,32 @@ msgstr "Pad voor"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "Ok"
 
@@ -294,9 +298,9 @@ msgstr "Maak TeX Live menu"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Wijzig bestandstypen"
 
@@ -345,9 +349,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Ja"
 
@@ -372,14 +376,14 @@ msgstr "Ja"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "Nee"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Installeren"
 
@@ -404,15 +408,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Voeg %s/texmf/doc/man toe aan MANPATH.\n"
-"Voeg %s/texmf/doc/info toe aan INFOPATH.\n"
-"En het belangrijkste: voeg %s/bin/%s\n"
-"toe aan PATH voor de huidige en voor toekomstige sessies."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -435,17 +435,17 @@ msgstr "Sluit af"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Geen"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Alleen nieuw"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Alle"
 
@@ -454,7 +454,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "letter"
 
@@ -466,15 +466,15 @@ msgstr "Laad"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -545,11 +545,11 @@ msgstr "Portable setup"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Wijzig"
 
@@ -574,7 +574,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (eigen macros etc.)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Opties"
 
@@ -697,7 +697,7 @@ msgid "Select arch-os"
 msgstr "Kies platform(s)"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "Verwijdering van de hoofd-architektuur niet mogelijk!"
 
@@ -733,7 +733,7 @@ msgstr ""
 "Portable optie gewijzigd;\n"
 "Folders opnieuw geïnitialiseerd"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
@@ -741,15 +741,15 @@ msgstr ""
 "Lokale TeX Live database is aan het laden;\n"
 "dit kan even duren, geduld aub ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "Kan taxonomie-bestand niet laden"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr "... klaar met laden"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -765,243 +765,244 @@ msgstr ""
 "\n"
 "De meeste knoppen zijn gedeactiveerd."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "Laad standaard installatie-bron."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Geladen installatie-bron"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "Geen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Laat instellingen zien"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Status"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "alle"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "geïnstalleerd"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "niet geïnstalleerd"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "nieuwe versies"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Categorie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "pakketten"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "collecties"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "Schema's"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "Match"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "beschrijvingen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "taxonomieën"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "bestandsnamen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Keuze"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "gekozen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "niet gekozen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Kies alles"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "Kies niets"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Hef filters op"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Naam van pakket"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Lokale rev. (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Online rev. (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Korte beschrijving"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Alles bijwerken"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Herinstalleer eerder verwijderde pakketten"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Werk bij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Verwijder"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Maak reserve-kopie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Akties"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Help"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "meerdere installatie-bronnen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Laad standaard installatie-bron."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Laad cmd line installatie-bron."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Laad standaard online installatie-bron."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Laad andere bron ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Algemeen ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Papier ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "Architekturen ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "GUI taal"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Geavanceerde instellingen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Aktiveer debug uitvoer"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Deaktiveer automatische installatie van nieuwe pakketten"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr ""
 "Deaktiveer automatische verwijdering van pakketten die op de server zijn "
 "verwijderd"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Werk database van bestandsnamen bij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Her-genereer alle formaten"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Werk font map database bij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Herinstalleer pakketten vanaf reserve-kopie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Symlinks naar standaard-folders"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Verwijder TeX Live %s ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Verwijder TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr "Klaar met volledig verwijderen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1010,281 +1011,282 @@ msgstr ""
 "Wilt u werkelijk de volledige TeX Live %s installatie verwijderen?\n"
 "Uw laatste kans om van gedachten te veranderen!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Handleiding"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "Info"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Details betreffende:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Pakket:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Categorie:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Korte beschrijving:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Lange beschrijving;"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Geïnstalleerd:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Lokale revisie:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Lokale versie van de Catalogus:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Online revisie:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Online versie van de Catalogus:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Trefwoorden:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "Funktionaliteit:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "Primaire omschrijving"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "Secundaire omschrijving"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Collectie:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr "Waarschuwing: Catalogus versies kunnen achterlopen of niet kloppen."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Hangt af van:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Afhankelijkheden binaries:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Run bestanden:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Doc bestanden:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Src bestanden:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Bin bestanden:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Nadere informatie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "Keuze van te ondersteunen architecturen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Voer de wijzigingen uit"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Algemene opties:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Standaard installatie-bron"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Genereer formaten tijdens installatie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Installeer bronbestanden voor macros/lettertypen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Installeer documentatie voor macros/lettertypen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Standaard folder voor reserve-kopie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Instelling voor automatische reserve-kopie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Doelfolder voor programma-symlinks"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Doelfolder voor symlinks info-bestanden"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Doelfolder voor symlinks man paginas"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Installeer voor alle gebruikers"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Papier instellingen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Standaard papier-formaat voor alle"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "a4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Standaard papier-formaat voor"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "GUI taal"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "Systeem-instelling"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Standaard-taal voor de GUI"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "Wijzigingen treden in werking na herstart"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Kies folder"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Wijzig de standaard installatie-bronnen voor pakketten"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr "Kies de te gebruiken installatie-bronnen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Verwijder"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr "Wijzig hoofd installatie-bron"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr "Wijzig aanvullende installatie-bron"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Voeg installatie-bron toe"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Voeg installatie-bron toe"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr "Label van installatie-bron al in gebruik: %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Herstel"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Selekteer papier-formaat voor"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "bewaar een onbeperkt aantal"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "deactiveer"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr "Laden van online database mislukt"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr "Foutmelding:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Installatie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1294,7 +1296,7 @@ msgstr ""
 "Het programma zal nu afsluiten.\n"
 "Herstart indien nodig."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1311,12 +1313,12 @@ msgstr ""
 "Het programma zal afsluiten na het updaten.\n"
 "Daarna kunt u het programma herstarten voor verdere updates."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr "Nog minstens %s verdere updates komen beschikbaar na updaten van tlmgr"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1324,64 +1326,64 @@ msgstr ""
 "Wacht aub. even nadat het programma is geeindigd, zodat het bijwerken kan "
 "worden voltooid."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Volledig herstel voltooid"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Kies te herstellen pakket, of herstel alle pakketten"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Revisie:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Herstel gekozen pakket"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Herstel alle pakketten tot hun nieuwste versie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Afsluiten"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Werk symbolische koppelingen bij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Verwijder symbolische koppelingen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Wijzig folder"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Nieuwe waarde voor"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Laad installatie-bron"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Installatie-bron."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Standaard online installatie-bron"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Klaar"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1767,6 +1769,17 @@ msgstr "Windows hulpprogramma's"
 msgid "XeTeX packages"
 msgstr "XeTeX pakketten"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Voeg %s/texmf/doc/man toe aan MANPATH.\n"
+#~ "Voeg %s/texmf/doc/info toe aan INFOPATH.\n"
+#~ "En het belangrijkste: voeg %s/bin/%s\n"
+#~ "toe aan PATH voor de huidige en voor toekomstige sessies."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Snelkoppelingen menu en bureau-blad"
 
diff --git a/Master/tlpkg/translations/pl.po b/Master/tlpkg/translations/pl.po
index 9d27cd57e9a..20890d63d79 100644
--- a/Master/tlpkg/translations/pl.po
+++ b/Master/tlpkg/translations/pl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-06-05 20:56+0100\n"
 "Last-Translator: Staszek Wawrykiewicz <staw@gust.org.pl>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -22,7 +22,7 @@ msgstr "Instalowanie TeX Live %s"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Zakończ"
 
@@ -102,8 +102,8 @@ msgstr "REPOZYTORIA W SIECI"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Domyślne repozytorium"
 
@@ -148,20 +148,21 @@ msgstr "Trochę to potrwa..."
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -206,18 +207,18 @@ msgstr "Docelowy folder:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Zmień"
 
@@ -256,29 +257,32 @@ msgstr "Podaj ścieżkę dla"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "Zamknij"
 
@@ -296,9 +300,9 @@ msgstr "Dodaj skróty do menu systemowego"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Zmiana asocjacji typu plików"
 
@@ -347,9 +351,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Tak"
 
@@ -374,14 +378,14 @@ msgstr "Tak"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "Nie"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Instaluj"
 
@@ -406,15 +410,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Dodaj %s/texmf/doc/man do MANPATH.\n"
-"Dodaj %s/texmf/doc/info do INFOPATH.\n"
-"Najważniejsze: dodaj %s/bin/%s\n"
-"do zmiennej PATH dla bieżącej i przyszłych sesji."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -437,17 +437,17 @@ msgstr "Zakończ"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Nie"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Tylko dla nowych"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Dla wszystkich"
 
@@ -456,7 +456,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "letter"
 
@@ -468,15 +468,15 @@ msgstr "Wczytaj"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -546,11 +546,11 @@ msgstr "Ustawienia dla instalacji przenośnej"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Zmień"
 
@@ -575,7 +575,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (folder dla prywatnych plików użytkownika)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Opcje"
 
@@ -698,7 +698,7 @@ msgid "Select arch-os"
 msgstr "Wybór systemu operacyjnego"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "Usuwanie binariów dla głównej platformy jest niemożliwe!"
 
@@ -734,7 +734,7 @@ msgstr ""
 "Zmieniono opcję dla instalacji przenośnej.\n"
 "Foldery zostały ponownie zainicjowane"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
@@ -742,15 +742,15 @@ msgstr ""
 "Wczytuję lokalną bazę danych TeX Live;\n"
 "trochę to potrwa, proszę czekać..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "Nie można wczytać pliku taksonomii"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr "... wczytano"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -766,242 +766,243 @@ msgstr ""
 "\n"
 "Wiekszość przycisków będzie nieaktywna."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "Wczytaj domyślne"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Wczytane repozytorium pakietów:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "żadne"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Konfiguracja wyświetlania"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Status"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "wszystkie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "zainstalowane"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "nie zainstalowane"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "aktualizacje"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Kategoria"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "pakiety"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "kolekcje"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "schematy"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "Dopasuj szukanie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "opis(y)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "taksonomie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "nazwy plików"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Wybór"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "zaznaczone"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "nie zaznaczone"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Zaznacz wszystkie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "Odznacz wszystkie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Anuluj filtry"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Nazwa pakietu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Lokalna wer. (wyd.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Dostępna wer. (wyd.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Krótki opis"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Aktualizuj wszystkie zainstalowane pakiety"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Zainstaluj ponownie usunięte uprzednio pakiety"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Usuń"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Kopia zapasowa pakietów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Zadania"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Pomoc"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "kilka repozytoriów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Wczytaj domyślne repozytorium pakietów:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Wczytaj repozytorium pakietów z linii poleceń:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Wczytaj domyślne repozytorium pakietów w sieci:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Wczytaj inne repozytorium..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Ogólne..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Format papieru..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "Systemy operacyjne..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "Język komunikatów w trybie GUI"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Opcje zaawansowane"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Włącz zapis debugowania"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Wyłącz automatyczne instalowanie nowszych pakietów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr ""
 "Wyłącz automatyczne usuwanie pakietów, które zostały usunięte z repozytorium"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Aktualizuj bazę danych"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Odbuduj wszystkie pliki formatów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Aktualizuj mapy fontowe"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Odtwórz pakiety z kopii zapasowej"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Dowiązania symboliczne w katalogach systemowych"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Usuń TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Usuwanie TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr "Zakończono całkowite usuwanie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1010,283 +1011,284 @@ msgstr ""
 "Czy naprawdę usunąć całą instalację TeX Live %s?\n"
 "Ostatni moment na zmianę decyzji!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Podręcznik"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "O programie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Szczegóły:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Pakiet:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Kategoria:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Krótki opis:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Opis bardziej szczegółowy:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Zainstalowane:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Lokalny nr wydania:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Lokalna wersja wg TeX Catalogue"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Dostępny nr wydania:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Dostępna wersja wg TeX Catalogue:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Słowa kluczowe:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "Funcjonalność:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "Podstawowa charakterystyka:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "Drugorzędna charakterystyka:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Kolekcja:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 "Uwaga:  nr wersji wg TeX Catalogue może być niezbyt aktualny lub wręcz "
 "błędny."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Zależności:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Zależności programów:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Pliki użytkowe:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Pliki dokumentacji:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Pliki źródłowe:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Pliki binariów:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Pozostałe informacje"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "Wybierz platformę (system operacyjny)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Zatwierdź zmiany"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Opcje ogólne"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Domyślne repozytorium pakietów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Generowanie plików formatów podczas instalacji"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Instaluj pliki źródłowe makr/fontów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Instaluj dokumentacje makr/fontów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Domyślny katalog dla kopii zapasowej pakietów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Ustawienie automatyczne zapisu kopii zapasowej"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Docelowy katalog dowiązań do programów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Docelowy katalog dowiązań do dokumentacji info"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Docelowy katalog dowiązań do stron man"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Instaluj dla wszystkich użytkowników"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Opcje formatu papieru"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Domyślny format papieru dla wszystkich programów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "a4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Domyślny format papieru dla"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "Język trybu GUI"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "Domyślny dla systemu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Domyślny język dla trybu GUI"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "Zmiany będą zastosowane po restarcie programu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Wybierz katalog"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Pokaż domyślne repozytoria pakietów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr "Podaj wybór repozytoriów, które będą użyte"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Usuń"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr "Zmień główne repozytorium pakietów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr "Zmień dodatkowe repozytorium pakietów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Dodaj repozytorium"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Dodaj repozytorium pakietów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr "Nazwa etykiety repozytorium już w użyciu: %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Przywróć"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "wybór formatu papieru dla"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "zachowaj dowolnie wiele"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "wyłącz"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr "Wczytanie bazy danych z sieci nie powiodło się."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr "Komunikat błędu:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Instalacja"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1296,7 +1298,7 @@ msgstr ""
 "Program zakończy teraz działanie.\n"
 "Uruchom ponownie, jeśli wystąpi taka potrzeba."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1315,12 +1317,12 @@ msgstr ""
 "Po aktualizacji program zakończy działanie.\n"
 "Uruchom ponownie dla dalszych aktualizacji. "
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr "Po aktualizacji tlmgr dostępnych jest dalszych %s aktualizacji."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1328,64 +1330,64 @@ msgstr ""
 "Proszę zaczekać chwilę po zakończeniu programu, aby aktualizacja została "
 "dokonana. "
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Odtwarzanie zakończone"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Zaznacz pakiet do odtworzenia, lub odtwórz wszystkie pakiety"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Nr wydania:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Odtwórz zaznaczony pakiet"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Odtwórz wszyskie pakiety w poprzedniej wersji"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Zamknij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Aktualizuj dowiązania symboliczne"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Usuń dowiązania symboliczne"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Wybór katalogu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Nowa wartość dla"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Wczytaj dane repozytorium pakietów"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Repozytorium pakietów:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Domyślne repozytorium w sieci"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Zakończono"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1770,6 +1772,17 @@ msgstr "Dodatkowe programy dla Windows"
 msgid "XeTeX packages"
 msgstr "Pakiety dla XeTeX"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Dodaj %s/texmf/doc/man do MANPATH.\n"
+#~ "Dodaj %s/texmf/doc/info do INFOPATH.\n"
+#~ "Najważniejsze: dodaj %s/bin/%s\n"
+#~ "do zmiennej PATH dla bieżącej i przyszłych sesji."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Utwórz skróty w menu"
 
diff --git a/Master/tlpkg/translations/pt_BR.po b/Master/tlpkg/translations/pt_BR.po
index 042e67410b1..f9256a8d3f4 100644
--- a/Master/tlpkg/translations/pt_BR.po
+++ b/Master/tlpkg/translations/pt_BR.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-07-14 11:08-0300\n"
 "Last-Translator: Paulo Roberto Massa Cereda <cereda@users.sf.net>\n"
 "Language-Team: Paulo Roberto Massa Cereda <cereda@users.sf.net>\n"
@@ -23,7 +23,7 @@ msgstr "Instalação do TeX Live %s"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Sair"
 
@@ -103,8 +103,8 @@ msgstr "REPOSITÓRIOS DE REDE"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Repositório remoto padrão"
 
@@ -150,20 +150,21 @@ msgstr "Isto vai levar algum tempo!"
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -208,18 +209,18 @@ msgstr "Diretório de destino:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Alterar"
 
@@ -258,29 +259,32 @@ msgstr "Digite o caminho para"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "Ok"
 
@@ -298,9 +302,9 @@ msgstr "Adicionar atalhos de menu"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Alterar as associações de arquivos"
 
@@ -350,9 +354,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Sim"
 
@@ -377,14 +381,14 @@ msgstr "Sim"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "Não"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Instalar"
 
@@ -409,15 +413,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Adicione %s/texmf/doc/man em MANPATH.\n"
-"Adicione %s/texmf/doc/info em INFOPATH.\n"
-"E o mais importante adicione %s/bin/%s\n"
-"em PATH para as sessões futuras."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -440,17 +440,17 @@ msgstr "Finalizar"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Nenhum"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Apenas novos"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Todos"
 
@@ -459,7 +459,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "carta"
 
@@ -471,15 +471,15 @@ msgstr "Carregar"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Aviso"
 
@@ -550,11 +550,11 @@ msgstr "Configuração portátil"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Alternar"
 
@@ -579,7 +579,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (diretório para arquivos específicos do usuário)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Opções"
 
@@ -702,7 +702,7 @@ msgid "Select arch-os"
 msgstr "Selecionar arquitetura do sistema operacional"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "Não é possível realizar a remoção da plataforma principal!"
 
@@ -738,7 +738,7 @@ msgstr ""
 "Opção portátil alterada;\n"
 "Os diretórios foram reinicializados"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
@@ -746,15 +746,15 @@ msgstr ""
 "Carregando o banco de dados local do TeX Live.\n"
 "Este procedimento pode levar algum tempo, por favor, aguarde!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "Não é possível carregar o arquivo de taxonomia"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr "... carregamento concluído"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -770,241 +770,242 @@ msgstr ""
 "\n"
 "A maioria dos botões será desabilitada."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "Carregar padrão"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Repositório carregado:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "nenhum"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Exibir configuração"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Situação"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "todos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "instalado"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "não instalado"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "atualizações"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Categoria"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "pacotes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "coleções"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "esquemas"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "Coincidir"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "descrições"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "taxonomias"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "nomes de arquivos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Seleção"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "selecionado"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "não selecionado"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Selecionar tudo"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "Remover a seleção"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Limpar filtros"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Nome do pacote"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Revisão local (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Revisão remota (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Descrição curta"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Atualizar todos os instalados"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Reinstalar os pacotes previamente removidos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Atualizar"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Remover"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Cópia de segurança"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Ações"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Ajuda"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "repositórios múltiplos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Carregar repositório padrão:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Carregar repositório de linha de comando:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Carregar repositório de rede padrão:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Carregar outro repositório..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Geral..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Papel..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "Plataformas..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "Idiomas do GUI..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Opções avançadas"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Habilitar saída de depuração"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Desabilitar a instalação automática de novos pacotes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "Desabilitar a remoção automática de pacotes removidos no servidor"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Atualizar o banco de dados de nomes de arquivos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Reconstruir todos os formatos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Atualizar o banco de dados de mapeamento de fontes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Restaurar pacotes a partir de uma cópia de segurança"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Manipular links simbólicos em diretórios do sistema"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Remover o TeX Live %s..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Remover o TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr "Remoção completa concluída"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1014,283 +1015,284 @@ msgstr ""
 "Live %s?\n"
 "É a sua última chance de mudar de idéia!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Manual"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "Sobre"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Detalhes sobre:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Pacote:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Categoria:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Descrição curta:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Descrição longa:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Instalado:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Revisão local:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Versão do catálogo local:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Revisão remota:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Versão do catálogo remoto:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Palavras-chave:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "Funcionalidade:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "Caracterização primária:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "Caracterização secundária:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Coleção:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 "Aviso: as versões de catálogo devem estar desatualizadas ou simplesmente "
 "erradas."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Depende de:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Dependências de binários:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Arquivos de execução:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Arquivos de documentação:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Arquivos de código-fonte:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Arquivos binários:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Informação adicional"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "Selecione as plataformas a serem suportadas"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Aplicar alterações"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Opções gerais"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Repositório de pacotes padrão"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Criar formatos na instalação"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Instalar os códigos-fontes de macros/fontes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Instalar documentação de macros/fontes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Diretório padrão para cópia de segurança"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Configuração de cópia de segurança automática"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Destino do link para programas"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Destino do link para informações de documentação"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Destino do link para páginas de manual"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Instalar para todos os usuários"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Opções de papel"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Papel padrão para todos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "a4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Papel padrão para"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "Idioma do GUI"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "Padrão do sistema"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Idioma padrão para o GUI:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "As mudanças terão efeito após o reinício"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Escolher diretório"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Edite os repositórios padrões de pacotes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr "Especifique o conjunto de repositórios a serem usados"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Remover"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr "Alterar repositório de pacotes principal"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr "Alterar repositório de pacotes secundário"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Adicionar repositório"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Adicionar repositório de pacote"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr "Nome de etiqueta de repositório já está em uso: %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Reverter"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Selecione o formato do papel para"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "manter arbitrariamente muitos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "desabilitar"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr "O carregamento do banco de dados remoto falhou."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr "Mensagem de erro:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Instalação"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1300,7 +1302,7 @@ msgstr ""
 "O programa irá encerrar agora.\n"
 "Por favor, reinicie se necessário."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1318,14 +1320,14 @@ msgstr ""
 "O programa encerrará após a atualização.\n"
 "Então você poderá reiniciar o programa para as atualizações adicionais."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr ""
 "Ao menos %s atualizações adicionais estão disponíveis após a atualização do "
 "tlmgr."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1333,64 +1335,64 @@ msgstr ""
 "Por favor, aguarde um instante após o término do programa para que a "
 "atualização possa ser concluída."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Restauração concluída"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Selecione o pacote a ser restaurado, ou restaure todos os pacotes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Revisão:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Restaurar o pacote selecionado"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Restaurar todos os pacotes para a última versão"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Fechar"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Atualizar links simbólicos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Remover links simbólicos"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Editar diretório"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Novo valor para"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Carregar repositório de pacotes"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Repositório de pacotes:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Repositório de pacotes de rede padrão"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Concluído"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1777,6 +1779,17 @@ msgstr "Programas de suporte ao Windows"
 msgid "XeTeX packages"
 msgstr "Pacotes XeTeX"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Adicione %s/texmf/doc/man em MANPATH.\n"
+#~ "Adicione %s/texmf/doc/info em INFOPATH.\n"
+#~ "E o mais importante adicione %s/bin/%s\n"
+#~ "em PATH para as sessões futuras."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Criar atalhos no menu e na área de trabalho"
 
diff --git a/Master/tlpkg/translations/ru.po b/Master/tlpkg/translations/ru.po
index 308d22965f4..2f585b61e23 100644
--- a/Master/tlpkg/translations/ru.po
+++ b/Master/tlpkg/translations/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-06-05 11:17+0900\n"
 "Last-Translator: Vladimir Lomov <irk.translator@gmail.com>\n"
 "Language-Team: Russian <tldoc@tug.org>\n"
@@ -28,7 +28,7 @@ msgstr "Установка TeX Live %s"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Выход"
 
@@ -107,8 +107,8 @@ msgstr "СЕТЕВЫЕ РЕПОЗИТОРИИ"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Сетевой репозиторий по умолчанию"
 
@@ -153,20 +153,21 @@ msgstr "Это может занять некоторое время!"
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -211,18 +212,18 @@ msgstr "Целевой каталог:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Изменить"
 
@@ -262,29 +263,32 @@ msgstr "Введите путь для"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "Ок"
 
@@ -302,9 +306,9 @@ msgstr "Добавить в меню «Пуск»"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Изменить привязку файлов"
 
@@ -353,9 +357,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Да"
 
@@ -380,14 +384,14 @@ msgstr "Да"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "Нет"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Установить"
 
@@ -411,15 +415,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Добавьте %s/texmf/doc/man в MANPATH.\n"
-"Добавьте %s/texmf/doc/info в INFOPATH.\n"
-"Самое главное, добавьте %s/bin/%s\n"
-"к вашему PATH для текущей и будущих сессий."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -442,17 +442,17 @@ msgstr "Закончить"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Нет"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Только новые"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Все"
 
@@ -461,7 +461,7 @@ msgid "A4"
 msgstr "А4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "Letter"
 
@@ -473,15 +473,15 @@ msgstr "Загрузить"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -552,11 +552,11 @@ msgstr "Настройка для мобильного использовани�
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Переключить"
 
@@ -581,7 +581,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (каталог для личных файлов пользователей)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Параметры"
 
@@ -703,7 +703,7 @@ msgid "Select arch-os"
 msgstr "Выберите архитектуру-ОС"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "Удаление основной архитектуры невозможно!"
 
@@ -739,7 +739,7 @@ msgstr ""
 "Настройка мобильного использования изменилась;\n"
 "Каталоги были заново инициализированы"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
@@ -747,15 +747,15 @@ msgstr ""
 "Загружаем локальную базу данных TeX Live;\n"
 "это может занять время, пожалуйста подождите ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "Невозможно загрузить файл классификации"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr "... загрузка завершена"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -771,242 +771,243 @@ msgstr ""
 "\n"
 "Большая часть действий будет недоступна."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "Загрузить репозиторий по умолчанию"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Подключённый репозиторий:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "Нет"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Настройка отображения"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Статус"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "все"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "установленные"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "неустановленные"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "обновления"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Категория"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "пакеты"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "коллекции"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "схемы"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "Соответствие"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "описания"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "классификации"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "названия файлов"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Выбор"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "выделенные"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "невыделенные"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Выделить всё"
 
 # Select none, по исходному коду и смыслу переводим как "Снять выделение"
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "Снять выделение"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Сбросить фильтры"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Название пакета"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Локальная рев. (вер.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Сетевая рев. (вер.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Краткое описание"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Обновить все установленные"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Заново установить ранее удалённые пакеты"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Обновить"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Удалить"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Архивировать"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Действия"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Справка"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "репозитории"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Загрузить репозиторий по умолчанию:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Загрузить репозиторий из ком строки:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Загрузить сетевой репозиторий по умолчанию:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Загрузить другой репозиторий ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Общие ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Формат страницы ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "Платформы ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "Язык программы ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Дополнительные параметры"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Включить отладочный вывод"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Выключить автоматическую установку новых пакетов"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "Выключить автоматическое удаление пакетов, удалённых с сервера"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Обновить базу данных имён файлов"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Создать заново все форматы"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Обновить базу данных шрифтов"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Восстановить пакеты из архива"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Управление ссылками в системных каталогах"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Удалить TeX Live %s ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Удалить TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr "Полное удаление завершено"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1015,283 +1016,284 @@ msgstr ""
 "Действительно удалить ПОЛНОСТЬЮ всю установку TeX Live %s?\n"
 "Это ваш последний шанс изменить своё решение!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Руководство"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "О программе"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Подробности о:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Пакет:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Категория:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Краткое описание:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Подробное описание:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Установлен:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Локальная ревизия:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Версия в локальном реестре:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Сетевая ревизия:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Версия в Каталоге:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Ключевые слова:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "Характеристика:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "Основная характеристика:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "Дополнительная характеристика:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Коллекция:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 "Предупреждение: информация о версии в Каталоге может быть устаревшей или "
 "попросту неверной."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Зависит от:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Зависит от программ:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Рабочие файлы:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Документация:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Исходники:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Программы:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Дополнительно"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "Выберите необходимые вам архитектуры"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Применить"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Общие настройки"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Репозиторий пакетов по умолчанию"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Создавать форматы при установке"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Устанавливать исходные файлы для макросов и шрифтов"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Устанавливать документацию для макросов и шрифтов"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Каталог архивирования по умолчанию"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Параметр автоматического архивирования"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Каталог ссылок на программы"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Каталог ссылок на страницы info"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Каталог ссылок на страницы man"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Установить для всех пользователей"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Настройки формата страницы"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Формат страницы по умолчанию для всех"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "A4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Формат страницы по умолчанию для"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "Язык программы"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "Системное значение по умолчанию"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Язык по умолчанию для программы:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "Изменения вступят в силу после перезапуска программы"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Выберите каталог"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Изменить репозитории пакетов по умолчанию"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr "Указать список используемых репозиториев"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Удалить"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr "Изменить основной репозиторий пакетов"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr "Изменить вспомогательный репозиторий пакетов"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Добавить репозиторий"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Добавить репозиторий пакетов"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr "Название ярлыка для репозитория уже используется: %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Восстановить"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Выберите формат страницы для"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "сохранять сколько угодно"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "отключить"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr "Невозможно загрузить сетевую базу данных."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr "Ошибка:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Установка"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1301,7 +1303,7 @@ msgstr ""
 "Сейчас программа будет закрыта.\n"
 "Если необходимо, перезапустите программу."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1319,12 +1321,12 @@ msgstr ""
 "После обновления программа tlmgr будет закрыта. Запустите tlmgr затем снова, "
 "чтобы обновить другие пакеты."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr "После обновления tlmgr будут доступны ещё %s обновлений."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1332,64 +1334,64 @@ msgstr ""
 "Пожалуйста, после закрытия программы подождите немного, чтобы обновление "
 "завершилось."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Восстановление завершено"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Выберите пакет для восстановления или восстановить все пакеты"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Ревизия:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Восстановить выбранные пакеты"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Восстановить все пакеты до последней версии"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Закрыть"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Обновить символьные ссылки"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Удалить символьные ссылки"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Изменить каталог"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Новое значение для"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Загрузить репозиторий пакетов"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Репозиторий пакетов:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Сетевой репозиторий по умолчанию"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Завершено"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1774,6 +1776,17 @@ msgstr "Программы для Windows"
 msgid "XeTeX packages"
 msgstr "Пакеты XeTeX"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Добавьте %s/texmf/doc/man в MANPATH.\n"
+#~ "Добавьте %s/texmf/doc/info в INFOPATH.\n"
+#~ "Самое главное, добавьте %s/bin/%s\n"
+#~ "к вашему PATH для текущей и будущих сессий."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Создать ярлыки в меню «Пуск» и на рабочем столе"
 
diff --git a/Master/tlpkg/translations/sk.po b/Master/tlpkg/translations/sk.po
index fa76005f307..db09f003cab 100644
--- a/Master/tlpkg/translations/sk.po
+++ b/Master/tlpkg/translations/sk.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-05-17 23:09+0100\n"
 "Last-Translator: Ján Buša <jan.busa@tuke.sk>\n"
 "Language-Team:  <tex-live@tug.org>\n"
@@ -23,7 +23,7 @@ msgstr "Inštalácia TeX Live %s"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Ukončiť"
 
@@ -96,8 +96,8 @@ msgstr "SIEŤOVÉ SCHRÁNKY"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Predvolená vzdialená schránka"
 
@@ -142,20 +142,21 @@ msgstr "Bude to trvať istý čas!"
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -200,18 +201,18 @@ msgstr "Cieľový adresár:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Zmeniť"
 
@@ -251,29 +252,32 @@ msgstr "Vložte cestu pre"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "OK"
 
@@ -291,9 +295,9 @@ msgstr "Pridať skratky ponuky"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Zmeniť priradenia súborov"
 
@@ -342,9 +346,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Áno"
 
@@ -369,14 +373,14 @@ msgstr "Áno"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "Nie"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Nainštalovať"
 
@@ -401,15 +405,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Pridajte %s/texmf/doc/man ku MANPATH.\n"
-"Pridajte %s/texmf/doc/info k INFOPATH.\n"
-"A čo je najdôležitejšie, pridajte %s/bin/%s\n"
-"do vašej cesty  PATH pre aktuálnu a nasledujúce relácie (spustenia)."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -432,17 +432,17 @@ msgstr "Dokončiť"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Žiaden"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Len nové"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Všetky"
 
@@ -451,7 +451,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "letter"
 
@@ -463,15 +463,15 @@ msgstr "Načítať"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Varovanie"
 
@@ -542,11 +542,11 @@ msgstr "Prenosné nastavenie"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Prepnúť"
 
@@ -571,7 +571,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (adresár užívateľských súborov)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Voľby"
 
@@ -691,7 +691,7 @@ msgid "Select arch-os"
 msgstr "Zvoliť architektúru resp. operačný systém"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "Odstránenie hlavnej platformy nie je možné!"
 
@@ -727,21 +727,21 @@ msgstr ""
 "Voľba Portable [Prenosný] bola zmenená;\n"
 "Adresáre boli znovu nastavené do východzieho stavu."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "Nie je možné načítať súbor taxonómie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -757,241 +757,242 @@ msgstr ""
 "\n"
 "Väčšina tlačidiel bude zablokovaná."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "Načítať predvolené"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Načítaná schránka:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "žiadna"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Zobraziť konfiguráciu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Stav"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "všetky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "nainštalované"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "nenainštalované"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "aktualizácie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Kategória"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "balíky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "zbierky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "schémy"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "Porovnať"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "opisy"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "taxonómie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "názvy súborov "
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Voľba"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "zvolené"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "nezvolené"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Zvoliť všetky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "Nevoliť nič"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Zrušiť filtre"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Názov balíka"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Lokálna rev. (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Vzdialená rev. (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Stručný popis"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Aktualizovať všetko nainštalované"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Znova nainštalovať predtým odstránené balíky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Záloha"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Činnosti"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Pomoc"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "viacnásobné schránky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Načítať predvolenú schránku:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Načítať schránku cmd line:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Načítať predvolenú sieťovú schránku:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Načítať inú schránku ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Všeobecné ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Papier ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "Platformy ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "Jazyk grafického používateľského rozhrania ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Pokročilé voľby"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Povoliť ladiaci výstup"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Zablokovať automatickú inštaláciu nových balíkov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "Zablokovať automatické odstraňovanie balíkov vymazaných serverom"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Aktualizovať databázu názvov súborov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Znovu vytvoriť všetky formáty"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Aktualizovať databázu fontových zobrazení (font map)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Obnoviť balíky zo zálohy"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Spracovať symbolické odkazy v systémových adresároch"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Odstrániť TeX Live %s ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Odstrániť TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1000,282 +1001,283 @@ msgstr ""
 "Určite sa má odstrániť (odinštalovať)  CELÁ inštalácia TeX Live %s?\n"
 "Máte poslednú možnosť zmeniť tento svoj úmysel!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Príručka"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "O programe"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Podrobnosti:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Balík:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Kategória:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Stručný popis:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Rozsiahly popis:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Nainštalované"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Lokálna revízia:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Verzia lokálneho katalógu:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Vzdialená revízia:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Verzia vzdialeného katalógu:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Kľúčové slová"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "Funkčnosť:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "Základný popis:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "Druhotný popis:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Zbierka:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 "Varovanie: verzia katalógu môže byť oneskorená alebo jednoducho nesprávna."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Závisí:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Závislosti bináriek:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Spustiteľné súbory:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Dokumentačné súbory:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Zdrojové súbory:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Binárne súbory:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Ďalšie informácie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "Zvoliť podporované platformy"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Použiť zmeny"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Všeobecné voľby"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Predvolená schránka balíkov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Pri inštalácii vytvoriť formáty"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Nainštalovať zdroje makier/fontov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Nainštalovať dokumentáciu k makrám/fontom"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Predvolený záložný adresár"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Nastavenie automatického zálohovania"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Cieľ linky pre programy"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Cieľ linky pre informačnú dokumentáciu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Cieľ linky pre stránky manuálov (man pages)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Nainštalovať pre všetkých používateľov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Voľby papiera"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Predvolený papier pre všetkých"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "A4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Predvolený papier pre "
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "Jazyk grafického používateľského rozhrania"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "Predvoľba systému"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Predvolený jazyk grafického používateľského rozhrania:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "Zmeny sa prejavia po reštarte"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Zvoliť adresár"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Editácia predvolených schránok balíkov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr "Určte skupinu schránok na použitie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Zmazať"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Pridať schránku"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Pridať schránku balíka"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Vrátiť"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Zvoliť formát papiera pre"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "uchovávať ľubovoľne veľa"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "zablokovať"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Inštalácia"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1285,7 +1287,7 @@ msgstr ""
 "Program teraz skončí.\n"
 "V prípade potreby ho spusťte znova."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1303,14 +1305,14 @@ msgstr ""
 "Po aktualizácii sa program ukončí.\n"
 "Potom môžete program spustiť znova pre ďalšie aktualizácie."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr ""
 "K dispozícii je aspoň %s ďalších aktualizácií potom, čo bol aktualizovaný "
 "program tlmgr. "
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1318,64 +1320,64 @@ msgstr ""
 "Počkajte, prosím, chvíľočku po ukončení programu, aby bolo možné dokončiť "
 "aktualizáciu."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Obnova bola dokončená"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Zvoliť balíky na obnovu alebo obnoviť všetky balíky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Revízia:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Obnoviť zvolené balíky"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Obnoviť všetky balíky podľa poslednej verzie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Zavrieť"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Aktualizovať symbolické odkazy (linky)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Odstrániť symbolické odkazy (linky)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Editácia adresára"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Nová hodnota pre"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Načítať schránku balíkov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Schránka balíkov:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Predvolená sieťová schránka balíkov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Dokončené"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1760,6 +1762,17 @@ msgstr "programy podporujúce Windows"
 msgid "XeTeX packages"
 msgstr "Balíky XeTeXu"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Pridajte %s/texmf/doc/man ku MANPATH.\n"
+#~ "Pridajte %s/texmf/doc/info k INFOPATH.\n"
+#~ "A čo je najdôležitejšie, pridajte %s/bin/%s\n"
+#~ "do vašej cesty  PATH pre aktuálnu a nasledujúce relácie (spustenia)."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Vytvoriť odkazy v menu a na pracovnej ploche "
 
diff --git a/Master/tlpkg/translations/sl.po b/Master/tlpkg/translations/sl.po
index 45c211cb358..b1da2012ce2 100644
--- a/Master/tlpkg/translations/sl.po
+++ b/Master/tlpkg/translations/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-06-06 09:06+0100\n"
 "Last-Translator: Mojca Miklavec <mojca.miklavec.lists@gmail.com>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -23,7 +23,7 @@ msgstr "Namestitev TeX Live %s"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Izhod"
 
@@ -106,8 +106,8 @@ msgstr "MREŽNI REPOZITORIJI"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 #, fuzzy
 msgid "Default remote repository"
 msgstr "Privzeti spletni repozitorij"
@@ -154,20 +154,21 @@ msgstr "To utegne trajati nekaj časa."
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -213,18 +214,18 @@ msgstr "Ciljni imenik:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Spremeni"
 
@@ -264,29 +265,32 @@ msgstr "Nastavite pot do"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "V redu"
 
@@ -305,9 +309,9 @@ msgstr "Dodajne menijske bližnjice"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 #, fuzzy
 msgid "Change file associations"
 msgstr "Spremeni asociacije končnic datotek"
@@ -358,9 +362,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Da"
 
@@ -385,14 +389,14 @@ msgstr "Da"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "Ne"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Namesti"
 
@@ -415,17 +419,13 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:742
 #: tlpkg/installer/install-menu-perltk.pl:611
-#, fuzzy, perl-format
+#, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Dodajte:\n"
-"%s/texmf/doc/man v spremenljivko MANPATH,\n"
-"%s/texmf/doc/info v spremenljivko INFOPATH ter najpomembneje -\n"
-"%s/bin/%s v spremenljivko PATH."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -449,18 +449,18 @@ msgstr "Konec"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 #, fuzzy
 msgid "None"
 msgstr "Brez"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Samo nove"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Vse"
 
@@ -469,7 +469,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "letter"
 
@@ -481,15 +481,15 @@ msgstr "Naloži"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Opozorilo"
 
@@ -560,11 +560,11 @@ msgstr "Prenosljiva namestitev"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Vključi/Izključi"
 
@@ -589,7 +589,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (uporabnikove datoteke)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Možnosti"
 
@@ -714,7 +714,7 @@ msgid "Select arch-os"
 msgstr "Izbrane platforme"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 #, fuzzy
 msgid "Removals of the main platform not possible!"
 msgstr "Odstranitev arhitekture, na kateri teče računalnik, ni mogoča."
@@ -751,7 +751,7 @@ msgstr ""
 "Spremenili ste opcijo za prenosno namestitev;\n"
 "Mape za namestitev so se nastavile na privzeto vrednost."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
@@ -759,16 +759,16 @@ msgstr ""
 "Nalaganje lokalne podatkovne baze za TeX Live\n"
 "Prosim počakajte - to utegne trajati nekaj časa ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 #, fuzzy
 msgid "Cannot load taxonomy file"
 msgstr "Nalaganje datoteke s ključnimi besedami ni uspelo"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr "... naloženo"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -784,265 +784,266 @@ msgstr ""
 "\n"
 "(Večina možnosti bo onemogočena.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 #, fuzzy
 msgid "Load default"
 msgstr "Naloži privzeti repozitorij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Naložen repozitorij:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "brez"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 #, fuzzy
 msgid "Display configuration"
 msgstr "Kriteriji za prikaz paketov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Status"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "vsi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "nameščeni"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "nenameščeni"
 
 # 2. zavihek
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "posodobljeni"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Vrsta"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "paketi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "zbirke"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "sheme"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 #, fuzzy
 msgid "Match"
 msgstr "Iskanje"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 #, fuzzy
 msgid "descriptions"
 msgstr "po opisu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "po ključnih besedah"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 #, fuzzy
 msgid "filenames"
 msgstr "po imenih datotek"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Obkljukani"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "izbrani"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "neizbrani"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 #, fuzzy
 msgid "Select all"
 msgstr "Izberi vse"
 
 # NUJNO TODO
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 #, fuzzy
 msgid "Select none"
 msgstr "Briši izbor"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 #, fuzzy
 msgid "Reset filters"
 msgstr "Ponastavi spremembe"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Ime paketa"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Lokalna rev. (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Oddaljena rev. (ver.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Kratek opis"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Posodobi vse nameščene"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Ponovno namesti vse odstranjene pakete"
 
 # 2. zavihek
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Posodobi"
 
 # 3. zavihek
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Odstrani"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Naredi varnostno kopijo"
 
 # Prej je bilo prevedeno v Naloge
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Akcije"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Pomoč"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "več repozitorijev"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Naloži privzeti repozitorij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 #, fuzzy
 msgid "Load cmd line repository:"
 msgstr "Naloži privzeti oddaljeni repozitorij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Naloži privzeti oddaljeni repozitorij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Naloži repozitorij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Splošno ..."
 
 # Je to papir ali format papirja?
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Format papirja ..."
 
 # Je to papir ali format papirja?
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 #, fuzzy
 msgid "Platforms ..."
 msgstr "OS/arhitektura ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "Jezik uporabniškega vmesnika ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Napredne možnosti"
 
 # TODO: Prosim popravi tole
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 #, fuzzy
 msgid "Enable debugging output"
 msgstr "Omogoči razhroščevanje"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Onemogoči samodejno nameščanje novih paketov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr ""
 "Onemogoči samodejno odstranjevanje paketov, ki so bili izbrisani iz strežnika"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Posodobi bazo"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Ponovno generiraj vse formate"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Posodobi mapiranja za pisave"
 
 # Prikliči?
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 #, fuzzy
 msgid "Restore packages from backup"
 msgstr "Obnovi pakete iz varnostne kopije"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 #, fuzzy
 msgid "Handle symlinks in system dirs"
 msgstr "Namesti simbolne povezave v sistemske mape"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Odstrani TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Odstrani TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 #, fuzzy
 msgid "Complete removal finished"
 msgstr "Program je bil v celoti odstranjen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, fuzzy, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1051,302 +1052,303 @@ msgstr ""
 "Ste prepričani, da želite odstraniti TeX Live %s?\n"
 "To je še zadnja možnost, da si premislite."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Priročnik"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "O programu"
 
 # preveri, kje se pojavi
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Podrobnosti:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Paket:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Kratek opis:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Podroben opis:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Nameščen:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 #, fuzzy
 msgid "Local Revision:"
 msgstr "Lokalna verzija:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Verzija v lokalnem katalogu:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 #, fuzzy
 msgid "Remote Revision:"
 msgstr "Verzija na strežniku:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Verzija v katalogu na strežniku:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Ključne besede:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 #, fuzzy
 msgid "Functionality:"
 msgstr "Funkcionalnost:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 #, fuzzy
 msgid "Primary characterization:"
 msgstr "Primarna funkcija:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 #, fuzzy
 msgid "Secondary characterization:"
 msgstr "Sekundarna funkcija:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Zbirka:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr "Opozorilo: Verzija kataloga je morda zastarela ali napačna."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 #, fuzzy
 msgid "Depends:"
 msgstr "Potrebuje pakete:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 #, fuzzy
 msgid "Binaries' dependencies:"
 msgstr "Potrebuje bin. pakete:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Vsebovane datoteke:"
 
 # Datoteke z dokumentacijo
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 #, fuzzy
 msgid "Docfiles:"
 msgstr "Dokumentacija:"
 
 # Datoteke z izvorno kodo
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 #, fuzzy
 msgid "Srcfiles:"
 msgstr "Izvorna koda:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 #, fuzzy
 msgid "Binfiles:"
 msgstr "Binarne datoteke:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Dodatne informacije"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 #, fuzzy
 msgid "Select platforms to support"
 msgstr "Izbira podprtih arhitektur"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Uveljavi spremembe"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Splošne nastavitve"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Privzeti repozitorij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Ob namestitvi generiraj vse formate"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Namesti izvorno kodo za pisave in makre"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Namesti dokumentacijo za pisave in makre"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Privzeti imenik za varnostne kopije"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Število samodejno obdržanih starih verzij paketov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Ciljna povezava za programe"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Ciljna povezava za dokumentacijo"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 #, fuzzy
 msgid "Link destination for man pages"
 msgstr "Ciljna povezava za dokumentacijo (man pages)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Namesti za vse uporabnike"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 #, fuzzy
 msgid "Paper options"
 msgstr "Nastavitve papirja"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Privzeti format papirja za vse"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "a4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Privzeti format papirja za"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "Jezik grafičnega vmesnika"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 #, fuzzy
 msgid "System default"
 msgstr "Privzet sistemski jezik"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Privzeti jezik grafičnega vmesnika:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "Spremembe bodo upoštevane po ponovnem zagonu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Izberi imenik"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Uredi privzete repozitorije"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 #, fuzzy
 msgid "Specify set of repositories to be used"
 msgstr "Določi repozitorije, ki bodo uporabljeni"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Izbriši"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 #, fuzzy
 msgid "Change main package repository"
 msgstr "Spremeni glavni repozitorij s paketi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 #, fuzzy
 msgid "Change subsidiary package repository"
 msgstr "Spremeni pomožni repozitorij s paketi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Dodaj repozitorij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Dodaj repozitorij paketov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, fuzzy, perl-format
 msgid "Repository tag name already used: %s"
 msgstr "Ime repozitorija lahko uporabite le enkrat: '%s'"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Povrni"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Izberi format papirja za"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "obdrži jih poljubno mnogo"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "onemogoči"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr "Nalaganje oddaljene baze je spodletelo."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr "Sporočilo o napaki:"
 
 # 1. zavihek
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Dodajanje"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1356,7 +1358,7 @@ msgstr ""
 "Program se bo končal.\n"
 "Po potrebi ga lahko ponovno zaženete."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1371,12 +1373,12 @@ msgstr ""
 "preden v zavihku \"Posodobitve\" ne izberete \"Posodobi vse\".\n"
 "Ko se proces zaključi, lahko ponovno zaženete tlmgr za nadaljevanje."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr "Na voljo je vsaj %s posodobljenih paketov"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1384,71 +1386,71 @@ msgstr ""
 "Prosimo počakajte še trenutek po zaključku programa, da se posodobitev "
 "zaključi."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 #, fuzzy
 msgid "Restore completed"
 msgstr "Popolna odstranitev programa končana."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Izberi paket za obnovo ali obnovi vse pakete"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 #, fuzzy
 msgid "Revision:"
 msgstr "Verzija:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 #, fuzzy
 msgid "Restore selected package"
 msgstr "Izberi pakete"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 #, fuzzy
 msgid "Restore all package to latest version"
 msgstr "Ponastavi vse pakete na zadnjo verzijo"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Zapri"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Posodobi simbolne povezave"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Odstrani simbolne povezave"
 
 # spremeni direktorij
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Uredi direktorij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Nova vrednost za"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 #, fuzzy
 msgid "Load package repository"
 msgstr "Spremeni lokacijo repozitorija s paketi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 #, fuzzy
 msgid "Package repository:"
 msgstr "Nov repozitorij s paketi:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Privzeti spletni repozitorij"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Končano"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, fuzzy, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1841,5 +1843,17 @@ msgstr "Dodatni programi za Okna"
 msgid "XeTeX packages"
 msgstr "Paketi za XeTeX"
 
+#, fuzzy
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Dodajte:\n"
+#~ "%s/texmf/doc/man v spremenljivko MANPATH,\n"
+#~ "%s/texmf/doc/info v spremenljivko INFOPATH ter najpomembneje -\n"
+#~ "%s/bin/%s v spremenljivko PATH."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Ustvari bližnjice v meniju in na namizju"
diff --git a/Master/tlpkg/translations/sr.po b/Master/tlpkg/translations/sr.po
index 6ea0f61761f..623ab9b3698 100644
--- a/Master/tlpkg/translations/sr.po
+++ b/Master/tlpkg/translations/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-06-04 01:28+0400\n"
 "Last-Translator: Nikola Lečić <nikola.lecic@anthesphoria.net>\n"
 "Language-Team: Serbian/Cyrillic <tex-live@tug.org>\n"
@@ -26,7 +26,7 @@ msgstr "TeX Live %s: инсталација"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Напусти програм"
 
@@ -105,8 +105,8 @@ msgstr "МРЕЖНИ РЕПОЗИТОРИЈУМИ"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Подразумевани удаљени репозиторијум"
 
@@ -151,20 +151,21 @@ msgstr "Ово ће потрајати неко време!"
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Прекини"
 
@@ -209,18 +210,18 @@ msgstr "Циљни директоријум:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Промени"
 
@@ -258,29 +259,32 @@ msgstr "Унесите путању за"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "У реду"
 
@@ -298,9 +302,9 @@ msgstr "Додати пречице у менију"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Повежи типове фајлова са одговарајућим програмима"
 
@@ -349,9 +353,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "да"
 
@@ -376,14 +380,14 @@ msgstr "да"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "не"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Инсталирај"
 
@@ -408,15 +412,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Додајте %s/texmf/doc/man у MANPATH путању.\n"
-"Додајте %s/texmf/doc/info у INFOPATH путању.\n"
-"Најважније од свега, додајте %s/bin/%s\n"
-"у PATH путању за тренутну и све будуће сесије."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -439,17 +439,17 @@ msgstr "Заврши"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Ништа"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Само нови"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Све"
 
@@ -458,7 +458,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "letter"
 
@@ -470,15 +470,15 @@ msgstr "Учитај"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Упозорење"
 
@@ -549,11 +549,11 @@ msgstr "Преносива инсталација"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Обрни"
 
@@ -578,7 +578,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (директоријум за корисникове фајлове)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Подешавања"
 
@@ -704,7 +704,7 @@ msgstr ""
 "(архитектура - оперативни систем)"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "Уклањање главне платформе није могуће!"
 
@@ -740,7 +740,7 @@ msgstr ""
 "Промењена је опција за преносиву инсталацију.\n"
 "Постављене су нове вредности за директоријуме."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
@@ -748,15 +748,15 @@ msgstr ""
 "Учитавање локалне TeX Live базе података;\n"
 "ово може да потраје неко време, будите стрпљиви..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "Није могуће отворити фајл са обележјима"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr "... учитавање готово"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -772,241 +772,242 @@ msgstr ""
 "\n"
 "Највећи део дугмића биће неупотребљив."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "Учитај подразумевани репозиторијум"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Учитани репозиторијум:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "ниједан"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Параметри приказа"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Статус"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "све"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "инсталирано"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "није инсталирано"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "надоградње"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Категорија"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "пакети"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "колекције"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "шеме"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "Поклапање"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "описи"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "обележја"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "имена фајлова"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Избор"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "изабрано"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "неизабрано"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Изабери све"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "Не изабери ништа"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Ресетуј приказ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Назив пакета"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Локална рев. (вер.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Удаљена рев. (вер.)"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Кратак опис"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Надогради све што је инсталирано"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Поново инсталирај раније уклоњене пакете"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Надогради"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Уклони"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Бекап"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Акције"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Помоћ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "група репозиторијума"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Учитај подразумевани репозиторијум:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Учитај репозиторијум задат на командној линији:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Учитај подразумевани репозиторијум са Интернета:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Учитај неки други репозиторијум ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Општи параметри ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Папир ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "Платформе (архитектура / оперативни систем) ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "Језик TeX Live менаџера у графичком режиму ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Напредна подешавања"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Укључи детаљније (debug) описе"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Искључи аутоматску инсталацију нових пакета"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "Искључи аутоматско уклањање пакета обрисаних на серверу"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Освежи базу података са именима фајлова"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Поново направи све формате"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Освежи базу података са мапама фонтова"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Поврати пакете из бекапа"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Подешавања симболичких линкова у системским директоријумима"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Уклони TeX Live %s ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "TeX Live %s: уклањање"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr "Комплетно уклањање завршено"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1016,283 +1017,284 @@ msgstr ""
 "инсталацију TeX Live-а %s?\n"
 "Ово је последња прилика да се предомислите!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Приручник"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "О програму"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Детаљи о:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Пакет:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Категорија:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Кратак опис:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Дужи опис:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Инсталиран:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Локална ревизија:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Локална каталошка верзија:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Удаљена ревизија:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Удаљена каталошка верзија:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Кључне речи:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "Функционалност:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "Примарна обележја:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "Секундарна обележја:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Колекција:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 "Упозорење: каталошке верзије могу да буду у заостатку или просто да буду "
 "погрешне."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Повезан са:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Програми су повезани са:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Радни фајлови:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Фајлови са документацијом:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Фајлови са изворним кодом:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Бинарни фајлови (програми):"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Још података"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "Изаберите оперативне системе"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Примени промене"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Општи параметри"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Подразумевани репозиторијум пакета"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Направи формате приликом инсталације"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Инсталирај изворни код макроа и фонтова"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Инсталирај документацију за макрое и фонтове"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Подразумевани директоријум за бекапе"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Режим рада аутоматског бекаповања"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Директоријум за линкове ка програмима"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Директоријум за линкове ка info страницама"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Директоријум за линкове ка man страницама"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Инсталирај за све кориснике"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Подешавање папира"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Подразумевана величина папира за све програме"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "a4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Подразумевана величина папира за"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "Језик TeX Live менаџера у графичком режиму"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "Језик система"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Подразумевани језик за графичко окружење:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "Промене ће бити видљиве када поново покренете програм."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Изабери директоријум"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Промена подразумеваног репозиторијума са пакетима"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr "Одредите групу репозиторијума која ће се користити"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Обрисати"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr "Изменити главни репозиторијум са пакетима"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr "Промена помоћног репозиторијума са пакетима"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Додавање репозиторијума"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Додавање репозиторијума са пакетима"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr "Ознака репозиторијума је већ у употреби: %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Поништити измене"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Изаберите формат папира за"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "чувај неограничено много"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "искључи бекапе"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr "Учитавање удаљене базе података није успело."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr "Порука о грешци:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Инсталација"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1302,7 +1304,7 @@ msgstr ""
 "Програм ће сада прекинути рад.\n"
 "Покрените га поново ако буде неопходно."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1319,76 +1321,76 @@ msgstr ""
 "tlmgr ће се искључити када његова сопствена надоградња буде готова.\n"
 "Тада можете да га поново покренете ради даљих надоградњи."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr "Када tlmgr буде освежен, биће доступно најмање %s додатних надоградњи."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
 msgstr ""
 "Сачекајте мало након што се програм искључи како би се надоградња довршила."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Повраћај завршен"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Изаберите пакет који треба повратити, иначе се повраћају сви пакети"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Ревизија:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Поврати изабране пакете"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Повратити све пакете на последњу верзију"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Затвори"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Освежи симболичке линкове"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Уклони симболичке линкове"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Промена директоријума"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Нова вредност за"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Учитај репозиторијум пакета"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Репозиторијум пакета:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Подразумевани репозиторијум пакета на Интернету"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Готово"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1773,6 +1775,17 @@ msgstr "Програми за рад на Windows-у"
 msgid "XeTeX packages"
 msgstr "XeTeX пакети"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Додајте %s/texmf/doc/man у MANPATH путању.\n"
+#~ "Додајте %s/texmf/doc/info у INFOPATH путању.\n"
+#~ "Најважније од свега, додајте %s/bin/%s\n"
+#~ "у PATH путању за тренутну и све будуће сесије."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Направи пречице у менију и на десктопу"
 
diff --git a/Master/tlpkg/translations/vi.po b/Master/tlpkg/translations/vi.po
index 4a67a32feeb..2aee55033e2 100644
--- a/Master/tlpkg/translations/vi.po
+++ b/Master/tlpkg/translations/vi.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2012-05-14 07:07+0700\n"
 "Last-Translator: Anh K. Huỳnh <kyanh@viettug.org>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -25,7 +25,7 @@ msgstr "Cài đặt TeX Live %s"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "Thoát"
 
@@ -98,8 +98,8 @@ msgstr "NGUỒN TỪ MẠNG"
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "Nguồn cài đặt mặc định từ internet"
 
@@ -144,20 +144,21 @@ msgstr "Sẽ tốn ít thời gian!"
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "Bỏ qua"
 
@@ -202,18 +203,18 @@ msgstr "Cài đặt vào thư mục:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "Thay đổi"
 
@@ -252,29 +253,32 @@ msgstr "Nhập đường dẫn cho"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "Đồng ý"
 
@@ -292,9 +296,9 @@ msgstr "Thêm liên kết nhanh vào menu"
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "Đổi tương ứng tập tin - chương trình"
 
@@ -343,9 +347,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "Đồng ý"
 
@@ -370,14 +374,14 @@ msgstr "Đồng ý"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "Không đồng ý"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "Cài đặt"
 
@@ -402,15 +406,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"Thêm %s/texmf/doc/man vào MATHPATH\n"
-"Thêm %s/texmf/doc/info vào INFOPATH.\n"
-"Quan trọng nhất, thêm %s/bin/%s\n"
-"vào đường dẫn đến tập tin thi hành (PATH) để sử dụng cho cả sau này."
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -433,17 +433,17 @@ msgstr "Kết thúc"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "Không"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "Chỉ cái mới"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "Tất cả"
 
@@ -452,7 +452,7 @@ msgid "A4"
 msgstr "A4"
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "thư"
 
@@ -464,15 +464,15 @@ msgstr "Nạp"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "Cảnh báo"
 
@@ -542,11 +542,11 @@ msgstr "Cài đặt linh hoạt (có thể dùng ở máy khác)"
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "Hoán đổi"
 
@@ -575,7 +575,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (thư mục cho người dùng lưu trữ các gói, tập tin bổ sung)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "Tùy chọn"
 
@@ -693,7 +693,7 @@ msgid "Select arch-os"
 msgstr "Chọn kiểu hệ thống"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr "Không thể gỡ bỏ cài đặt cho hệ thống chính!"
 
@@ -729,21 +729,21 @@ msgstr ""
 "Đã đổi các tùy chọn cho cài đặt linh hoạt;\n"
 "Các thư mục vừa được thiết lập"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr "Không nạp được tập tin phân loại"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -759,241 +759,242 @@ msgstr ""
 "\n"
 "Hầu hết các tác vụ sẽ bị vô hiệu hóa."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "Nạp mặc định"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "Nguồn cài đặt đã nạp:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "không"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "Cấu hình thể hiện"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "Trạng thái"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "tất cả"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "đã cài đặt"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "chưa cài đặt"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "cập nhật"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "Phân loại"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "các gói"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "các nhóm"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "các nhóm"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "So khớp"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 msgid "descriptions"
 msgstr "mô tả"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr "phân loại"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr "tập tin"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "Lựa chọn"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "đã chọn"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "không được chọn"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "Chọn tất cả"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "Bỏ tất cả"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "Quay về lọc mặc định"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "Tên gói"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "Phiên bản đang có"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "Phiên bản trên máy phục vụ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "Mô tả ngắn"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "Cập nhật mọi thứ đã cài"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "Cài lại các gói đã gỡ ra trước đây"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "Cập nhật"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "Gỡ bỏ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "Sao lưu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "Hành động"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "Giúp đỡ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr "nhiều nguồn"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "Nạp nguồn cài đặt mặc định:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "Dùng nguồn cài đặt từ dòng lệnh:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "Nạp nguồn cài đặt từ internet:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "Nạp nguồn cài đặt khác ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "Tổng quan ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "Kiểu giấy ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr "Kiểu hệ thống ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr "Ngôn ngữ giao diện ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "Tùy chọn dành cho chuyên gia"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "Bật chế độ dò lỗi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "Không tự cài đặt gói mới"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "Không tự xóa các gói liên quan tới máy phục vụ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "Cập nhật danh sách tập tin trong hệ thống TeXLive"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "Tạo lại mọi định dạng"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "Cập nhật thông tin về các phông"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "Phục hồi gói từ bộ lưu trữ"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "Rà soát liên kết tượng trưng trong thư mục hệ thống"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "Gỡ bỏ TeX Live %s ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "Gỡ bỏ TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -1002,281 +1003,282 @@ msgstr ""
 "Bạn thật sự muốn gỡ bỏ hoàn toàn cài đặt TeX Live %s?\n"
 "Đây là cơ hội cuối để bạn đổi ý đấy!"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "Tài liệu hướng dẫn"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "Giới thiệu"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr "Chi tiết về:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "Gói:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "Phân lớp:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "Mô tả ngắn:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "Mô tả chi tiết:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "Đã cài đặt:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "Phiên bản đang có ở máy:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "Phiên bản ca-ta-lô ở đang có:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "Phiên bản ở máy phục vụ:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "Phiên bản ca-ta-lô ở máy phục vụ:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr "Từ khóa:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr "Chức năng:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr "Đặc trưng chính:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr "Đặc trưng phụ:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "Nhóm:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr "Chú ý: Phiên bản ca-ta-lô có thể bị lệch hoặc sai"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "Phụ thuộc vào:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "Phần mà các tập tin nhị phân đòi hỏi:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "Tập tin thi hành:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "Tập tin tài liệu:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "Tập tin nguồn:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "Tập tin thi hành:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "Thông tin khác"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 msgid "Select platforms to support"
 msgstr "Chọn kiểu hệ thống"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "Thực hiện thay đổi"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "Thiết lập cơ bản"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "Nguồn cài đặt mặc định"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "Tạo định dạng TeX (TeX formart) trong khi cài đặt"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "Cài đặt mã nguồn của macro/font"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "Cài đặt tài liệu về macro/font"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "Thư mục sao lưu mặc định"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "Cài đặt sao lưu tự động"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "Liên kết đích cho chương trình"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "Liên kết đích cho tài liệu thông tin"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "Liên kết đích cho các tài liệu hướng dẫn"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "Cài đặt cho mọi người trong hệ thống"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "Tùy chọn kiểu giấy"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "Kiểu giấy mặc định cho tất cả"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "a4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "Kiểu giấy mặc định cho"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr "Ngôn ngữ giao diện"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr "Mặc định của hệ thống"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr "Ngôn ngữ mặc định của giao diện:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "Thay đổi sẽ có tác dụng sau khi khởi động lại"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "Chọn thư mục"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr "Sửa nguồn cài đặt gói mặc định"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr "Chỉ định nhóm các nguồn cài đặt để dùng"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr "Xóa"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr "Thêm nguồn"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr "Thêm nguồn gói"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr "Phục hồi lại"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "Kiểu giấy chọn cho"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "giữ số lượng tùy ý"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "vô hiệu hóa"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "Cài đặt"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
@@ -1286,7 +1288,7 @@ msgstr ""
 "Chương trình sẽ thoát.\n"
 "Vui lòng khởi động lại nếu cần thiết."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1303,13 +1305,13 @@ msgstr ""
 "Chương trình sẽ đóng sau khi được cập nhật.\n"
 "Sau đó, bạn co thể khởi động lại chương trình để có có các cập nhật khác."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr ""
 "Sau khi cập nhật tlmgr thì sẽ có bổ sung thêm ít nhất %s cập nhật khác."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
@@ -1317,64 +1319,64 @@ msgstr ""
 "Vui lòng chờ một lát sau khi chương trình kết thúc, để cho việc cập nhật "
 "hoàn tất."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "Phục hồi hoàn tất"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "Chọn gói để khôi phục, hoặc chọn khôi phục mọi gói"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "Phiên bản:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "Phục hồi gói đã chọn"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "Cài đặt mọi gói ở phiên bản mới nhất"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "Đóng"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "Cập nhật liên kết tượng trưng"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "Gỡ bỏ liên kết tượng trưng"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr "Thư mục soạn thảo"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr "Giá trị mới cho"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "Nạp nguồn cài đặt gói"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "Nguồn cài đặt gói:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "Nguồn mặc định để cài gói từ internet"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "Đã hoàn tất"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1759,6 +1761,17 @@ msgstr "Hỗ trợ cho Windows"
 msgid "XeTeX packages"
 msgstr "Các gói cho XeTeX"
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Thêm %s/texmf/doc/man vào MATHPATH\n"
+#~ "Thêm %s/texmf/doc/info vào INFOPATH.\n"
+#~ "Quan trọng nhất, thêm %s/bin/%s\n"
+#~ "vào đường dẫn đến tập tin thi hành (PATH) để sử dụng cho cả sau này."
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "Tạo liên kết nhanh trong menu và trên màn hình"
 
diff --git a/Master/tlpkg/translations/zh_CN.po b/Master/tlpkg/translations/zh_CN.po
index dd3e44482f4..de956e38d9b 100644
--- a/Master/tlpkg/translations/zh_CN.po
+++ b/Master/tlpkg/translations/zh_CN.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2009-09-22 12:54+0800\n"
 "Last-Translator: Jiang Jiang <gzjjgod@gmail.com>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -22,7 +22,7 @@ msgstr "TeX Live %s 安装"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "退出"
 
@@ -95,8 +95,8 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr "缺省的网络软件包仓库"
 
@@ -141,20 +141,21 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "取消"
 
@@ -195,18 +196,18 @@ msgstr "目的文件夹:"
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "修改"
 
@@ -245,29 +246,32 @@ msgstr "输入路径变量"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "确定"
 
@@ -286,9 +290,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr "修改文件关联"
 
@@ -336,9 +340,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "是"
 
@@ -363,14 +367,14 @@ msgstr "是"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "否"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 msgid "Install"
 msgstr "安装"
 
@@ -394,15 +398,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"添加 %s/texmf/doc/man 到 MANPATH.\n"
-"添加 %s/texmf/doc/info 到 INFOPATH.\n"
-"最为重要的是，请添加 %s/bin/%s\n"
-"到你的 PATH 变量。"
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -423,17 +423,17 @@ msgstr "完成"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "None"
 msgstr "无"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr "只有新的"
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr "全部的"
 
@@ -442,7 +442,7 @@ msgid "A4"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr "letter"
 
@@ -454,15 +454,15 @@ msgstr "载入"
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr "警告"
 
@@ -528,11 +528,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "切换"
 
@@ -557,7 +557,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (用户专有文件的目录)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "选项"
 
@@ -675,7 +675,7 @@ msgid "Select arch-os"
 msgstr "选择系统架构"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 #, fuzzy
 msgid "Removals of the main platform not possible!"
 msgstr "不可能删除主架构文件！"
@@ -710,21 +710,21 @@ msgid ""
 "Directories have been reinitialized"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -739,243 +739,244 @@ msgstr ""
 "\n"
 "大部分按钮都被禁用了。"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr "载入缺省软件包仓库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr "已载入的软件包仓库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr "无"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr "显示配置"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr "状态"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 msgid "all"
 msgstr "全部的"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 msgid "installed"
 msgstr "已安装"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 msgid "not installed"
 msgstr "未安装"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr "更新"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr "分类"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 msgid "packages"
 msgstr "软件包"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 msgid "collections"
 msgstr "集合"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr "套装"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr "匹配"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 #, fuzzy
 msgid "descriptions"
 msgstr "简短描述"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 msgid "Selection"
 msgstr "选择"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 msgid "selected"
 msgstr "选定的"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 msgid "not selected"
 msgstr "未选的"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 msgid "Select all"
 msgstr "全部选择"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 msgid "Select none"
 msgstr "全部不选"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr "重置过滤器"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr "软件包名称"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr "本地版本"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr "远程版本"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr "简短描述"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 msgid "Update all installed"
 msgstr "更新全部已安装的"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr "重装先前删除的包"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr "更新"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr "删除"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr "备份"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 msgid "Actions"
 msgstr "操作"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr "帮助"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr "载入缺省软件包仓库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr "载入命令行仓库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr "载入缺省的网络仓库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr "载入其他仓库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 msgid "General ..."
 msgstr "通用..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr "纸张..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 #, fuzzy
 msgid "Platforms ..."
 msgstr "纸张..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 msgid "Expert options"
 msgstr "专家设置"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr "启用调试输出"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr "禁用新软件包的自动安装"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr "禁用服务器删除包的自动卸载"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr "更新文件名数据库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 msgid "Rebuild all formats"
 msgstr "重新创建所有格式文件"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr "更新字体映射数据库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr "从备份恢复软件包"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 msgid "Handle symlinks in system dirs"
 msgstr "创建指向系统目录的符号链接"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "删除 TeX Live %s ..."
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "删除 TeX Live %s"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
@@ -984,289 +985,290 @@ msgstr ""
 "确定要删除整个 TeX Live %s 的安装吗？\n"
 "这是你最后一次改变主意的机会！"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr "手册"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr "关于"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr "软件包:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr "分类:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr "简短描述:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr "详细描述:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 msgid "Installed:"
 msgstr "已安装的:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr "本地版本:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr "本地目录版本:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr "远程版本:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr "远程目录版本:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 msgid "Collection:"
 msgstr "集合:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr "警告: 目录版本可能是旧的或者错的。"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr "依赖:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr "二进制依赖:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr "运行文件:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr "文档文件:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr "源文件:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr "二进制文件:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 msgid "Further information"
 msgstr "详细信息"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 #, fuzzy
 msgid "Select platforms to support"
 msgstr "选择支持的架构"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr "应用修改"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 msgid "General options"
 msgstr "通用设置"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr "缺省的软件包仓库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 msgid "Create formats on installation"
 msgstr "安装时创建格式文件"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 msgid "Install macro/font sources"
 msgstr "安装宏包/字体源代码"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 msgid "Install macro/font docs"
 msgstr "安装宏包/字体文档"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr "缺省的备份目录"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 msgid "Auto backup setting"
 msgstr "自动备份设置"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr "程序的链接目的路径"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr "info 文档的链接目的路径"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr "man 手册页的链接目的路径"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr "给所有用户安装"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 msgid "Paper options"
 msgstr "纸张设置"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr "所有程序的缺省纸张"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr "a4"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr "缺省的纸张给"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr "修改会在重启后生效"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr "选择目录"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr "选择纸张格式给"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr "保持任意多的"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 msgid "disable"
 msgstr "禁用"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "安装 TeX Live"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
 "Please restart if necessary."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1277,75 +1279,75 @@ msgid ""
 "Then you can restart the program for further updates."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr "在 tlmgr 更新后至少有 %s 个软件包更新可用。"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
 msgstr "请在程序退出后等待一会，安装才会完成。"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 msgid "Restore completed"
 msgstr "恢复完毕"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr "选择需要恢复的包，或者恢复所有包"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr "版本:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 msgid "Restore selected package"
 msgstr "恢复指定软件包"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr "将所有包恢复到最新版本"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr "关闭"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr "更新符号链接"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr "删除符号链接"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr "载入软件包仓库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr "软件包仓库:"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr "缺省的网络软件包仓库"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr "完成"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1730,6 +1732,17 @@ msgstr ""
 msgid "XeTeX packages"
 msgstr ""
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "添加 %s/texmf/doc/man 到 MANPATH.\n"
+#~ "添加 %s/texmf/doc/info 到 INFOPATH.\n"
+#~ "最为重要的是，请添加 %s/bin/%s\n"
+#~ "到你的 PATH 变量。"
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "系统集成"
 
diff --git a/Master/tlpkg/translations/zh_TW.po b/Master/tlpkg/translations/zh_TW.po
index 6af9a3eaa56..a8c9cabe248 100644
--- a/Master/tlpkg/translations/zh_TW.po
+++ b/Master/tlpkg/translations/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-10-31 04:37+0100\n"
+"POT-Creation-Date: 2013-04-08 21:17+0200\n"
 "PO-Revision-Date: 2009-09-03 12:34+0200\n"
 "Last-Translator: Norbert Preining <preining@logic.at>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -22,7 +22,7 @@ msgstr "TeX Live %s 安裝"
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
 #: tlpkg/installer/install-menu-perltk.pl:577
-#: texmf/scripts/texlive/tlmgrgui.pl:527
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:527
 msgid "Quit"
 msgstr "退出"
 
@@ -95,8 +95,8 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:254
 #: tlpkg/installer/install-menu-perltk.pl:272
-#: texmf/scripts/texlive/tlmgrgui.pl:1465
-#: texmf/scripts/texlive/tlmgrgui.pl:1497
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1465
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1497
 msgid "Default remote repository"
 msgstr ""
 
@@ -141,20 +141,21 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:937
 #: tlpkg/installer/install-menu-perltk.pl:1001
 #: tlpkg/installer/install-menu-perltk.pl:1032
-#: texmf/scripts/texlive/tlmgrgui.pl:612 texmf/scripts/texlive/tlmgrgui.pl:613
-#: texmf/scripts/texlive/tlmgrgui.pl:1040
-#: texmf/scripts/texlive/tlmgrgui.pl:1252
-#: texmf/scripts/texlive/tlmgrgui.pl:1368
-#: texmf/scripts/texlive/tlmgrgui.pl:1437
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1510
-#: texmf/scripts/texlive/tlmgrgui.pl:1698
-#: texmf/scripts/texlive/tlmgrgui.pl:1763
-#: texmf/scripts/texlive/tlmgrgui.pl:1800
-#: texmf/scripts/texlive/tlmgrgui.pl:1833
-#: texmf/scripts/texlive/tlmgrgui.pl:2481
-#: texmf/scripts/texlive/tlmgrgui.pl:2518
-#: texmf/scripts/texlive/tlmgrgui.pl:2580
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1040
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1252
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1368
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1437
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1510
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1698
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1763
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1800
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1833
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2481
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2518
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2580
 msgid "Cancel"
 msgstr "取消"
 
@@ -195,18 +196,18 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:415
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:480
-#: texmf/scripts/texlive/tlmgrgui.pl:1138
-#: texmf/scripts/texlive/tlmgrgui.pl:1176
-#: texmf/scripts/texlive/tlmgrgui.pl:1184
-#: texmf/scripts/texlive/tlmgrgui.pl:1193
-#: texmf/scripts/texlive/tlmgrgui.pl:1201
-#: texmf/scripts/texlive/tlmgrgui.pl:1209
-#: texmf/scripts/texlive/tlmgrgui.pl:1237
-#: texmf/scripts/texlive/tlmgrgui.pl:1355
-#: texmf/scripts/texlive/tlmgrgui.pl:1583
-#: texmf/scripts/texlive/tlmgrgui.pl:2445
-#: texmf/scripts/texlive/tlmgrgui.pl:2450
-#: texmf/scripts/texlive/tlmgrgui.pl:2455
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1138
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1176
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1184
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1193
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1201
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1209
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1355
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2450
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2455
 msgid "Change"
 msgstr "改變"
 
@@ -243,29 +244,32 @@ msgstr "輸入路徑變數"
 #: tlpkg/installer/install-menu-perltk.pl:999
 #: tlpkg/installer/install-menu-perltk.pl:1030
 #: tlpkg/installer/install-menu-perltk.pl:1047
-#: texmf/scripts/texlive/tlmgrgui.pl:239 texmf/scripts/texlive/tlmgrgui.pl:612
-#: texmf/scripts/texlive/tlmgrgui.pl:616 texmf/scripts/texlive/tlmgrgui.pl:618
-#: texmf/scripts/texlive/tlmgrgui.pl:636 texmf/scripts/texlive/tlmgrgui.pl:815
-#: texmf/scripts/texlive/tlmgrgui.pl:1052
-#: texmf/scripts/texlive/tlmgrgui.pl:1417
-#: texmf/scripts/texlive/tlmgrgui.pl:1447
-#: texmf/scripts/texlive/tlmgrgui.pl:1448
-#: texmf/scripts/texlive/tlmgrgui.pl:1507
-#: texmf/scripts/texlive/tlmgrgui.pl:1632
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
-#: texmf/scripts/texlive/tlmgrgui.pl:1762
-#: texmf/scripts/texlive/tlmgrgui.pl:1789
-#: texmf/scripts/texlive/tlmgrgui.pl:1824
-#: texmf/scripts/texlive/tlmgrgui.pl:1873
-#: texmf/scripts/texlive/tlmgrgui.pl:1945
-#: texmf/scripts/texlive/tlmgrgui.pl:1976
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2370
-#: texmf/scripts/texlive/tlmgrgui.pl:2478
-#: texmf/scripts/texlive/tlmgrgui.pl:2516
-#: texmf/scripts/texlive/tlmgrgui.pl:2575
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:239
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:612
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:636
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:815
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1447
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1762
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1789
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1824
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1873
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1945
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1976
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2370
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2478
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2516
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2575
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Ok"
 msgstr "確定"
 
@@ -283,9 +287,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:478
 #: tlpkg/installer/install-menu-perltk.pl:726
 #: tlpkg/installer/install-menu-perltk.pl:731
-#: texmf/scripts/texlive/tlmgrgui.pl:1233
-#: texmf/scripts/texlive/tlmgrgui.pl:1809
-#: texmf/scripts/texlive/tlmgrgui.pl:1813
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1233
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1809
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1813
 msgid "Change file associations"
 msgstr ""
 
@@ -331,9 +335,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1236
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "Yes"
 msgstr "是"
 
@@ -358,14 +362,14 @@ msgstr "是"
 #: tlpkg/installer/install-menu-perltk.pl:1246
 #: tlpkg/installer/install-menu-perltk.pl:1248
 #: tlpkg/installer/install-menu-perltk.pl:1264
-#: texmf/scripts/texlive/tlmgrgui.pl:683
-#: texmf/scripts/texlive/tlmgrgui.pl:1097
-#: texmf/scripts/texlive/tlmgrgui.pl:1711
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:683
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1097
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1711
 msgid "No"
 msgstr "否"
 
 #: tlpkg/installer/install-menu-wizard.pl:685
-#: texmf/scripts/texlive/tlmgrgui.pl:439
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:439
 #, fuzzy
 msgid "Install"
 msgstr "安裝 TeX Live"
@@ -390,15 +394,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
-"Add %s/texmf/doc/man to MANPATH.\n"
-"Add %s/texmf/doc/info to INFOPATH.\n"
+"Add %s/texmf-dist/doc/man to MANPATH.\n"
+"Add %s/texmf-dist/doc/info to INFOPATH.\n"
 "Most importantly, add %s/bin/%s\n"
 "to your PATH for current and future sessions."
 msgstr ""
-"添加 %s/texmf/doc/man 到 MANPATH.\n"
-"添加 %s/texmf/doc/info 到 INFOPATH.\n"
-"最為重要的是，請添加 %s/bin/%s\n"
-"到你的 PATH 變數。"
 
 #: tlpkg/installer/install-menu-wizard.pl:745
 #: tlpkg/installer/install-menu-perltk.pl:614
@@ -419,18 +419,18 @@ msgstr "完成"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
 #: tlpkg/installer/install-menu-perltk.pl:1247
-#: texmf/scripts/texlive/tlmgrgui.pl:145
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 #, fuzzy
 msgid "None"
 msgstr "否"
 
 #: tlpkg/installer/install-menu-perltk.pl:57
-#: texmf/scripts/texlive/tlmgrgui.pl:146
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:146
 msgid "Only new"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:58
-#: texmf/scripts/texlive/tlmgrgui.pl:147
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:147
 msgid "All"
 msgstr ""
 
@@ -439,7 +439,7 @@ msgid "A4"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:61
-#: texmf/scripts/texlive/tlmgrgui.pl:1340
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1340
 msgid "letter"
 msgstr ""
 
@@ -451,15 +451,15 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:308
 #: tlpkg/installer/install-menu-perltk.pl:1045
 #: tlpkg/installer/install-menu-perltk.pl:1255
-#: texmf/scripts/texlive/tlmgrgui.pl:237
-#: texmf/scripts/texlive/tlmgrgui.pl:1050
-#: texmf/scripts/texlive/tlmgrgui.pl:1641
-#: texmf/scripts/texlive/tlmgrgui.pl:1870
-#: texmf/scripts/texlive/tlmgrgui.pl:1943
-#: texmf/scripts/texlive/tlmgrgui.pl:1974
-#: texmf/scripts/texlive/tlmgrgui.pl:2284
-#: texmf/scripts/texlive/tlmgrgui.pl:2344
-#: texmf/scripts/texlive/tlmgrgui.pl:2660
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:237
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1050
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1641
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1870
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1943
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1974
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2344
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2660
 msgid "Warning"
 msgstr ""
 
@@ -525,11 +525,11 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:487
 #: tlpkg/installer/install-menu-perltk.pl:495
 #: tlpkg/installer/install-menu-perltk.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:1155
-#: texmf/scripts/texlive/tlmgrgui.pl:1162
-#: texmf/scripts/texlive/tlmgrgui.pl:1169
-#: texmf/scripts/texlive/tlmgrgui.pl:1219
-#: texmf/scripts/texlive/tlmgrgui.pl:1228
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1155
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1162
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1169
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1219
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1228
 msgid "Toggle"
 msgstr "切換"
 
@@ -555,7 +555,7 @@ msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFLOCAL (存放本地格式檔等)"
 
 #: tlpkg/installer/install-menu-perltk.pl:426
-#: texmf/scripts/texlive/tlmgrgui.pl:496
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:496
 msgid "Options"
 msgstr "選項"
 
@@ -676,7 +676,7 @@ msgid "Select arch-os"
 msgstr "選擇系統架構"
 
 #: tlpkg/installer/install-menu-perltk.pl:1046
-#: texmf/scripts/texlive/tlmgrgui.pl:1051
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1051
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
@@ -710,21 +710,21 @@ msgid ""
 "Directories have been reinitialized"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:171
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:171
 msgid ""
 "Loading local TeX Live database;\n"
 "this may take some time, please be patient ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:218
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:218
 msgid "Cannot load taxonomy file"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:232
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:232
 msgid "... done loading"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:238
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:238
 #, perl-format
 msgid ""
 "You don't have permissions to change the installation in any way,\n"
@@ -734,557 +734,559 @@ msgid ""
 "Most buttons will be disabled."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:284
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:284
 msgid "Load default"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
-#: texmf/scripts/texlive/tlmgrgui.pl:2610
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2610
 msgid "Loaded repository:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:290
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:290
 msgid "none"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:297
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:297
 msgid "Display configuration"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:302
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:302
 msgid "Status"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:305 texmf/scripts/texlive/tlmgrgui.pl:359
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:305
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:359
 #, fuzzy
 msgid "all"
 msgstr "安裝 TeX Live"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:307
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:307
 #, fuzzy
 msgid "installed"
 msgstr "安裝 TeX Live"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:309
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:309
 #, fuzzy
 msgid "not installed"
 msgstr "安裝 TeX Live"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:311
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:311
 msgid "updates"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:314
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:314
 msgid "Category"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:316
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:316
 #, fuzzy
 msgid "packages"
 msgstr "選擇系統架構"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:318
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:318
 #, fuzzy
 msgid "collections"
 msgstr "標準安裝"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:320
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:320
 msgid "schemes"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:323
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:323
 msgid "Match"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:328
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:328
 #, fuzzy
 msgid "descriptions"
 msgstr "選項"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:331
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:331
 msgid "taxonomies"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:335
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:335
 msgid "filenames"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:357
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:357
 #, fuzzy
 msgid "Selection"
 msgstr "全部選擇"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:361
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:361
 #, fuzzy
 msgid "selected"
 msgstr "選擇安裝方案"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:364
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:364
 #, fuzzy
 msgid "not selected"
 msgstr "選擇安裝方案"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:372
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:372
 #, fuzzy
 msgid "Select all"
 msgstr "全部選擇"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:374
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:374
 #, fuzzy
 msgid "Select none"
 msgstr "全部選擇"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:378
 msgid "Reset filters"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:400
 msgid "Package name"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:401
 msgid "Local rev. (ver.)"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:402
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:402
 msgid "Remote rev. (ver.)"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:403
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:403
 msgid "Short description"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:417
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:417
 #, fuzzy
 msgid "Update all installed"
 msgstr "安裝 TeX Live"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:421
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:421
 msgid "Reinstall previously removed packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:434
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:434
 msgid "Update"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:443
-#: texmf/scripts/texlive/tlmgrgui.pl:2000
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2000
 msgid "Remove"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:448
 msgid "Backup"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:498
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:498
 #, fuzzy
 msgid "Actions"
 msgstr "選項"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:502
-#: texmf/scripts/texlive/tlmgrgui.pl:2685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:502
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2685
 msgid "Help"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:511
-#: texmf/scripts/texlive/tlmgrgui.pl:1104
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1686
-#: texmf/scripts/texlive/tlmgrgui.pl:2606
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:511
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1104
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1686
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2606
 msgid "multiple repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:514
-#: texmf/scripts/texlive/tlmgrgui.pl:1271
-#: texmf/scripts/texlive/tlmgrgui.pl:1273
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:514
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1271
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1273
 msgid "Load default repository:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:517
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:517
 msgid "Load cmd line repository:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:520
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:520
 msgid "Load default net repository:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:523
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:523
 msgid "Load other repository ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:533
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:533
 #, fuzzy
 msgid "General ..."
 msgstr "選項"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:535
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:535
 msgid "Paper ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:538
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:538
 msgid "Platforms ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:542
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:542
 msgid "GUI Language ..."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:546
-#: texmf/scripts/texlive/tlmgrgui.pl:1445
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:546
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1445
 #, fuzzy
 msgid "Expert options"
 msgstr "選項"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:550
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:550
 msgid "Enable debugging output"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:554
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:554
 msgid "Disable auto-install of new packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:557
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
 msgid "Disable auto-removal of server-deleted packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:564
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:564
 msgid "Update filename database"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:572
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:572
 #, fuzzy
 msgid "Rebuild all formats"
 msgstr "創建所有格式檔"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:583
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:583
 msgid "Update font map database"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:596
-#: texmf/scripts/texlive/tlmgrgui.pl:2354
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:596
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2354
 msgid "Restore packages from backup"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:602
-#: texmf/scripts/texlive/tlmgrgui.pl:2436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:602
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2436
 #, fuzzy
 msgid "Handle symlinks in system dirs"
 msgstr "創建指向系統目錄的符號鏈結"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:608
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:608
 #, fuzzy, perl-format
 msgid "Remove TeX Live %s ..."
 msgstr "歡迎進入 TeX Live %s 的世界！"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:611
 #, perl-format
 msgid "Remove TeX Live %s"
 msgstr "歡迎進入 TeX Live %s 的世界！"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:618
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:618
 msgid "Complete removal finished"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:623
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:623
 #, perl-format
 msgid ""
 "Really remove (uninstall) the COMPLETE TeX Live %s installation?\n"
 "Your last chance to change your mind!"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:632
 msgid "Manual"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:633 texmf/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
 msgid "About"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:657
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:657
 msgid "Details on:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:667
-#: texmf/scripts/texlive/tlmgrgui.pl:2378
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:667
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2378
 msgid "Package:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:669
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:669
 msgid "Category:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:671
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:671
 msgid "Short description:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:679
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:679
 msgid "Long description:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:682
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:682
 #, fuzzy
 msgid "Installed:"
 msgstr "安裝 TeX Live"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:685
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:685
 msgid "Local Revision:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:689
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:689
 msgid "Local Catalogue Version:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:693
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:693
 msgid "Remote Revision:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:697
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:697
 msgid "Remote Catalogue Version:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:702
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:702
 msgid "Keywords:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:707
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:707
 msgid "Functionality:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:712
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:712
 msgid "Primary characterization:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:717
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:717
 msgid "Secondary characterization:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:728
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:728
 #, fuzzy
 msgid "Collection:"
 msgstr "標準安裝"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:732
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:732
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:770
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:770
 msgid "Depends:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:774
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:774
 msgid "Binaries' dependencies:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:776
 msgid "Runfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:777
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:777
 msgid "Docfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:778
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:778
 msgid "Srcfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:790
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:790
 msgid "Binfiles:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:795
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:795
 #, fuzzy
 msgid "Further information"
 msgstr "進一步定制"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1021
-#: texmf/scripts/texlive/tlmgrgui.pl:1026
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1021
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1026
 #, fuzzy
 msgid "Select platforms to support"
 msgstr "選擇語言支援"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1037
-#: texmf/scripts/texlive/tlmgrgui.pl:1249
-#: texmf/scripts/texlive/tlmgrgui.pl:1365
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1037
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1249
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1365
 msgid "Apply changes"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1116
-#: texmf/scripts/texlive/tlmgrgui.pl:1125
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1116
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1125
 #, fuzzy
 msgid "General options"
 msgstr "選項"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1130
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1130
 msgid "Default package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1151
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1151
 #, fuzzy
 msgid "Create formats on installation"
 msgstr "創建所有格式檔"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1158
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1158
 #, fuzzy
 msgid "Install macro/font sources"
 msgstr "安裝字體/巨集包源碼目錄樹"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1165
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1165
 #, fuzzy
 msgid "Install macro/font docs"
 msgstr "安裝字體/巨集包文檔目錄樹"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1172
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1172
 msgid "Default backup directory"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1180
-#: texmf/scripts/texlive/tlmgrgui.pl:1771
-#: texmf/scripts/texlive/tlmgrgui.pl:1776
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1180
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1771
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1776
 #, fuzzy
 msgid "Auto backup setting"
 msgstr "選項"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1189
-#: texmf/scripts/texlive/tlmgrgui.pl:2443
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1189
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2443
 msgid "Link destination for programs"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1197
-#: texmf/scripts/texlive/tlmgrgui.pl:2448
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1197
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2448
 msgid "Link destination for info docs"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1205
-#: texmf/scripts/texlive/tlmgrgui.pl:2453
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1205
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2453
 msgid "Link destination for man pages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1215
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1215
 msgid "Create shortcuts on the desktop"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1224
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1224
 msgid "Install for all users"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1324
-#: texmf/scripts/texlive/tlmgrgui.pl:1333
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1324
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1333
 #, fuzzy
 msgid "Paper options"
 msgstr "選項"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1337
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1337
 msgid "Default paper for all"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1338
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1338
 msgid "a4"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1352
-#: texmf/scripts/texlive/tlmgrgui.pl:1756
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1756
 msgid "Default paper for"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1373
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1373
 msgid "GUI Language"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1396
-#: texmf/scripts/texlive/tlmgrgui.pl:1401
-#: texmf/scripts/texlive/tlmgrgui.pl:1419
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1396
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1401
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1419
 msgid "System default"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1400
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1400
 msgid "Default language for GUI:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1415
-#: texmf/scripts/texlive/tlmgrgui.pl:1444
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1415
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1444
 msgid "Changes will take effect after restart"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1489
-#: texmf/scripts/texlive/tlmgrgui.pl:2507
-#: texmf/scripts/texlive/tlmgrgui.pl:2562
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1489
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2507
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2562
 msgid "Choose Directory"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1555
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1555
 msgid "Edit default package repositories"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1558
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1558
 msgid "Specify set of repositories to be used"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1574
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1574
 msgid "Delete"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1588
-#: texmf/scripts/texlive/tlmgrgui.pl:1591
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1588
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1591
 msgid "Change main package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1589
-#: texmf/scripts/texlive/tlmgrgui.pl:1592
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1589
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1592
 msgid "Change subsidiary package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1613
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1613
 msgid "Add repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1615
-#: texmf/scripts/texlive/tlmgrgui.pl:1616
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1615
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1616
 msgid "Add package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1642
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1642
 #, perl-format
 msgid "Repository tag name already used: %s"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1700
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1700
 msgid "Revert"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1752
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1752
 msgid "Select paper format for"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1779
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1779
 msgid "keep arbitrarily many"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1780
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1780
 #, fuzzy
 msgid "disable"
 msgstr "安裝 TeX Live"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1871
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1871
 msgid "Loading of remote database failed."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1872
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1872
 msgid "Error message:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1911
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1911
 msgid "Installation"
 msgstr "安裝 TeX Live"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:1944
-#: texmf/scripts/texlive/tlmgrgui.pl:1975
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1944
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1975
 msgid ""
 "Critical updates have been installed.\n"
 "Program will terminate now.\n"
 "Please restart if necessary."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2285
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2285
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
@@ -1295,77 +1297,77 @@ msgid ""
 "Then you can restart the program for further updates."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2287
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2287
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2289
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2289
 msgid ""
 "Please wait a bit after the program has terminated so that the update can be "
 "completed."
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2369
-#: texmf/scripts/texlive/tlmgrgui.pl:2371
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2369
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2371
 #, fuzzy
 msgid "Restore completed"
 msgstr "選擇安裝方案"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2376
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2376
 msgid "Select the package to restore, or restore all packages"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2392
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2392
 msgid "Revision:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2397
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2397
 #, fuzzy
 msgid "Restore selected package"
 msgstr "選擇安裝方案"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2413
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2413
 msgid "Restore all package to latest version"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2429
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2429
 msgid "Close"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2461
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2461
 msgid "Update symbolic links"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2468
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2468
 msgid "Remove symbolic links"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2501
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2501
 msgid "Edit directory"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
 msgid "New value for"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2536
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2536
 msgid "Load package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2539
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2539
 msgid "Package repository:"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2569
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Default net package repository"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2654
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2654
 msgid "Completed"
 msgstr ""
 
-#: texmf/scripts/texlive/tlmgrgui.pl:2661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2661
 #, perl-format
 msgid ""
 "Running %s failed.\n"
@@ -1748,6 +1750,17 @@ msgstr ""
 msgid "XeTeX packages"
 msgstr ""
 
+#~ msgid ""
+#~ "Add %s/texmf/doc/man to MANPATH.\n"
+#~ "Add %s/texmf/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "添加 %s/texmf/doc/man 到 MANPATH.\n"
+#~ "添加 %s/texmf/doc/info 到 INFOPATH.\n"
+#~ "最為重要的是，請添加 %s/bin/%s\n"
+#~ "到你的 PATH 變數。"
+
 #~ msgid "Create shortcuts in menu and on desktop"
 #~ msgstr "系統集成"