autoupdate via tl-update-messages

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

18 files changed, 3373 insertions, 3447 deletions

diff --git a/Master/tlpkg/translations/cs.po b/Master/tlpkg/translations/cs.po
index 5e8e96b0352..c95d49ee392 100644
--- a/Master/tlpkg/translations/cs.po
+++ b/Master/tlpkg/translations/cs.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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2016-05-03 17:30+0200\n"
 "Last-Translator: Petr Sojka <sojka@fi.muni.cz>\n"
 "Language-Team: Czech <>\n"
@@ -56,13 +56,12 @@ msgstr "Instalace"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -89,49 +88,49 @@ msgstr ""
 msgid "Finish"
 msgstr "Dokončit"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Výchozí formát papíru"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Přidat menu zkratek"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Změna asociace typů souborů k programům"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Úprava nastavení PATH v registrech"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Instalace pro všechny uživatele"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Nainstaluj pomocníka TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalace TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Ukončit"
@@ -141,9 +140,9 @@ msgstr "Ukončit"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Předcházející"
 
@@ -151,8 +150,8 @@ msgstr "< Předcházející"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Další >"
 
@@ -195,29 +194,29 @@ msgid "Change default repository"
 msgstr "Změnit výchozí zdroj"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Zdroj pro příkazový řádek"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "MÍSTNÍ ZDROJE"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "SÍŤOVÉ ZDROJE"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Výchozí síťový zdroj balíků"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Vybrat zdroj"
 
@@ -246,7 +245,7 @@ msgid "This will take some time!"
 msgstr "Bude to nějakou dobu trvat!"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Nelze načíst vzdálenou databázi TeX Live:"
 
@@ -268,24 +267,23 @@ msgstr ""
 "     místní: %s\n"
 "      zdroj: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Cílová složka:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -301,7 +299,7 @@ msgstr "Cílová složka:"
 msgid "Change"
 msgstr "Změnit"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -309,63 +307,21 @@ msgstr ""
 "Cílová složka bude obsahovat vlastní instalaci.\n"
 "Je důrazně doporučeno, aby jméno poslední složky označovalo rok."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "vyžadované místo na disku"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(výchozí složka nepovolena, nebo nemá povolen zápis - prosím, změňte!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Zadat cestu pro"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "OK"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Tato obrazovka umožňuje změnit některá nastavení"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -378,88 +334,88 @@ msgstr ""
 "Chcete-li cokoliv změnit, vraťte se,\n"
 "v opačném případě stiskněte tlačítko \"Nainstaluj\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Ano"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Ne"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Nainstaluj"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Žádné"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Jen nové"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Všechny"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Nahrát"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -471,11 +427,48 @@ msgstr "Nahrát"
 msgid "Warning"
 msgstr "Varování"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Prosím vyberte jiné zrcadlo."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "OK"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -489,48 +482,48 @@ msgstr ""
 "  zdroj: %s\n"
 "Prosím, zvolte jiné zrcadlo."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Základní informace"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Binární systém(y)"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Vybrané schéma"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Další přizpůsobení"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Kolekce k instalaci"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Nastavení adresářové struktury"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Portabilní nastavení"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -539,77 +532,77 @@ msgstr "Portabilní nastavení"
 msgid "Toggle"
 msgstr "Přepnout"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (hlavní adresář TeXu)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (adresář pro umístění lokálních souborů)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (adresář pro generované soubory)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (adresář pro lokální konfiguraci)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (adresář pro uživatelské soubory)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Volby"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Povolení spouštění omezeného seznamu programů pomocí \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Vytvořit všechny formáty"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Instalovat dokumentaci fontů/maker"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Instalovat zdrojové soubory fontů/maker"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Vytvořit symbolické linky v systémových adresářích"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "Po instalaci stáhněte aktualizace balíků z CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "O programu"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Nainstaluj TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Pokračuj"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -617,7 +610,7 @@ msgstr ""
 "Instalační program nemá administrátorská práva;\n"
 "lze instalovat pouze pro současného uživatele."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -625,79 +618,79 @@ msgstr ""
 "Chcete-li instalovat pro všechny uživatele, klikněte pravým tlačítkem\n"
 "install-tl-advanced a zvolte \"run as administrator\""
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Změnit hodnotu proměnné"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Zadat cestu pro %s (pro %s použijte ~)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "vlastní výběr kolekcí"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Vybrat kolekce k nainstalování"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Zrušit výběr všech položek"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "vytvořit symbolické linky ve standardních adresářích"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "binární soubory do"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "manuálové stránky do"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "info soubory do"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Vybrat architekturu a OS"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Odstranění hlavní architektury není možné!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcí z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(prosím, změňte nejdříve TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(na výchozí umístění nelze zapisovat - prosím změňte!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1591,6 +1584,9 @@ msgstr "Podpůrné programy výhradně pro Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX a balíky"
 
+#~ msgid "Enter path for"
+#~ msgstr "Zadat cestu pro"
+
 #~ msgid "XML scheme"
 #~ msgstr "schéma XML"
 
diff --git a/Master/tlpkg/translations/de.po b/Master/tlpkg/translations/de.po
index d024e0cfa8a..915f5b0b9dd 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2018-03-18 15:32+0100\n"
 "Last-Translator: Uwe Ziegenhagen <ziegenhagen@gmail.com>\n"
 "Language-Team: TL German Translation Team <tex-live@tug.org>\n"
@@ -56,13 +56,12 @@ msgstr "Installation"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -89,49 +88,49 @@ msgstr "Scrollen Sie zurück, um die Warnungen zu prüfen"
 msgid "Finish"
 msgstr "Beenden"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Standard-Papierformat"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Füge Menüeinträge hinzu"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Anpassen der Datei-Verknüpfungen"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Ändere die PATH Einstellung in der Registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Installation für alle Benutzer"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Installiere TeXworks als Frontend"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s Installation"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Beenden"
@@ -141,9 +140,9 @@ msgstr "Beenden"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Zurück"
 
@@ -151,8 +150,8 @@ msgstr "< Zurück"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Weiter >"
 
@@ -198,29 +197,29 @@ msgid "Change default repository"
 msgstr "Ändern der voreingestellten Installationsquelle"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Kommandozeilen-Repository"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "Lokale Repositories"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "Netzwerk-Repositories"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Voreingestelltes Netzwerk-Repository"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Auswahl der  Installationsquelle"
 
@@ -249,7 +248,7 @@ msgid "This will take some time!"
 msgstr "Dies kann jetzt ein wenig dauern..."
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Konnte die Netzwerk-Datenbank von TeX Live nicht laden:"
 
@@ -271,24 +270,23 @@ msgstr ""
 "  lokal: %s\n"
 "  Installationsquelle:%s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Zielverzeichnis:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -304,7 +302,7 @@ msgstr "Zielverzeichnis:"
 msgid "Change"
 msgstr "Ändern"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -312,64 +310,22 @@ msgstr ""
 "Das Installationsverzeichnis enthält die TeX Live Installation.\n"
 "Wie empfehlen, das Jahr als letzten Ordner beizubehalten."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "Benötigter Festplattenplatz:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 "(Standardverzeichnis nicht zugänglich oder beschreibbar - bitte ändern)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Bitte geben Sie den Pfad ein für"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "Ok"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Weitere Konfigurations-Optionen:"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -382,88 +338,88 @@ msgstr ""
 "Wenn Sie etwas ändern möchten, gehen Sie bitte zurück,\n"
 "andernfalls drücken Sie auf \"Installation\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Ja"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Nein"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Installation"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Keine(n)"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Nur neue"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Alle"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "Letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr "Keine Menülinks"
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr "TeX Live Menü"
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr "Eintrag im Startmenü"
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Laden"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -475,11 +431,48 @@ msgstr "Laden"
 msgid "Warning"
 msgstr "Warnung"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Bitte einen anderen Spiegelserver wählen."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "Ok"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -494,48 +487,48 @@ msgstr ""
 "  Installationsquelle: %s\n"
 "Bitte anderen Spiegelserver auswählen."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Grundlegende Informationen"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Binärsysteme"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Ausgewählter Installations-Umfang"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Weitere Einstellungen"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Auswahl der Komponenten"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Ordner-Einrichtung"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Portable Installation"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -544,79 +537,79 @@ msgstr "Portable Installation"
 msgid "Toggle"
 msgstr "Ändern"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (Hauptverzeichnis für TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (lokale Makro-Pakete, etc)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (automatisch erstellte Dateien)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (lokale Konfiguration)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (Eigene Makro-Pakete)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Optionen"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Ausführen einer eingeschränkten Liste von Programmen via \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Alle Formatdateien erstellen"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Installation der Font/Macro-Dokumentation"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Installation der Font/Macro-Quellen"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Symbolische Links in Systemverzeichnissen"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "Hole nach der Installation Paket-Updates von CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Über TeX Live Manager (tlmgr)"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "TeX Live installieren"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Weiter"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 "Im Fall von auftretenden Problemen versuchen Sie es einmal mit deaktiviertem "
 "Virenscanner."
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -624,7 +617,7 @@ msgstr ""
 "Das Install-Programm läuft nicht mit Administrator-Berechtigung;\n"
 "es kann daher nur für den aktuellen Nutzer installieren."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -633,79 +626,79 @@ msgstr ""
 "ausführen\"\n"
 "wenn Sie für alle Benutzer installieren möchten."
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Ändern der Werte von Variablen"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Bitte geben Sie den Pfad ein für %s (~ steht für %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "benutzerdefinierte Auswahl der Collections"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Auswahl der zu installierenden Paketgruppen"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Alle anwählen"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Alle abwählen"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "Erstellen von symbolischen Links in Standard-Ordnern"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "Programme nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "Hilfeseiten (*.man) nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "Infoseiten (*.info) nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Auswahl der Architekturen"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Entfernen der Hauptarchitekturen ist nicht möglich!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s von %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s Paketgruppen von %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(Bitte zuerst TEXDIR ändern!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(Vorgabe ohne Schreibberechtigung - bitte ändern!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1597,6 +1590,9 @@ msgstr "Zusatzprogramme (nur-Windows)"
 msgid "XeTeX and packages"
 msgstr "XeTeX und Pakete"
 
+#~ msgid "Enter path for"
+#~ msgstr "Bitte geben Sie den Pfad ein für"
+
 #~ msgid "Mathematics and science packages"
 #~ msgstr "Mathematik- und Wissenschaftspakete"
 
diff --git a/Master/tlpkg/translations/es.po b/Master/tlpkg/translations/es.po
index ce393302612..0d5f1450dc2 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+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"
@@ -49,13 +49,12 @@ msgstr "Proceso de instalación"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -82,49 +81,49 @@ msgstr ""
 msgid "Finish"
 msgstr "Terminar"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Cambiar asociaciones de archivos"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Configurar la variable PATH en el registro"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Instalación para todos los usuarios"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Instalar el editor gráfico TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalación de TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Salir"
@@ -134,9 +133,9 @@ msgstr "Salir"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Atrás"
 
@@ -144,8 +143,8 @@ msgstr "< Atrás"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Siguiente >"
 
@@ -182,29 +181,29 @@ msgid "Change default repository"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Repositorio de paquetes por defecto"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr ""
 
@@ -233,7 +232,7 @@ msgid "This will take some time!"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
@@ -251,24 +250,23 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Ruta de instalación:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -284,7 +282,7 @@ msgstr "Ruta de instalación:"
 msgid "Change"
 msgstr "Cambiar"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -293,63 +291,21 @@ msgstr ""
 "Se recomienda encarecidamente que se mantenga el año como la última parte de "
 "la ruta de instalación."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Introduzca la ruta para"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "Aceptar"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Esta pantalla le permite configurar ciertas opciones"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -362,88 +318,88 @@ msgstr ""
 "Si quiere cambiar algo, vuelva atrás,\n"
 "o si quiere continuar presione el botón \"Instalar\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Sí"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "No"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Instalar"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Ninguna"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Sólo nuevas"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Todas"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "carta"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Cargar"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -455,11 +411,48 @@ msgstr "Cargar"
 msgid "Warning"
 msgstr "Advertencia"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "Aceptar"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -469,48 +462,48 @@ msgid ""
 "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Información básica"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Arquitectura seleccionada"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Esquema seleccionado"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Personalización avanzada"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Configuración de directorios"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -519,161 +512,161 @@ msgstr ""
 msgid "Toggle"
 msgstr "Cambiar (sí/no)"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (directorio TeX principal)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (directorio de ficheros locales)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (directorio de datos generados automáticamente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (directorio de configuración local)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (directorio de ficheros personales del usuario)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Opciones"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Crear todos los archivos de formato"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Instalar la documentación de tipos de letra y macros"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Instalar las fuentes de tipos de letra y macros"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Crear enlaces simbólicos en los  directorios de sistema"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Acerca de"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Instalar Tex Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Cambiar el valor de la variable"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Introduzca la ruta para %s (use ~ para %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Seleccione las colecciones que se instalarán"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Deseleccionar todo"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "crear enlaces simbólicos en los directorios estándar"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "ficheros ejecutables en"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "páginas de manual en"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "información en"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Seleccionar arquitectura-sistema operativo"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s de %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(por favor, ¡cambie el TEXDIR primero!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(no se permite la escritura, ¡cambie el directorio por favor!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1546,6 +1539,9 @@ msgstr ""
 msgid "XeTeX and packages"
 msgstr ""
 
+#~ msgid "Enter path for"
+#~ msgstr "Introduzca la ruta para"
+
 #~ msgid ""
 #~ "You don't have permissions to change the installation in any way,\n"
 #~ "specifically, the directory %s is not writable.\n"
diff --git a/Master/tlpkg/translations/fr.po b/Master/tlpkg/translations/fr.po
index e86f963a77a..4229f9189dd 100644
--- a/Master/tlpkg/translations/fr.po
+++ b/Master/tlpkg/translations/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2018-03-18 19:09+0100\n"
 "Last-Translator: Denis Bitouzé <dbitouze@wanadoo.fr>\n"
 "Language-Team: French <>\n"
@@ -59,13 +59,12 @@ msgstr "Processus d'installation"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -92,49 +91,49 @@ msgstr "Revenir en arrière pour inspecter les avertissements"
 msgid "Finish"
 msgstr "Terminer"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Taille de papier par défaut"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Ajouter des raccourcis au menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Modifier les associations de fichiers"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Modifier le réglage du PATH dans la base de registre"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Installer pour tous les utilisateurs"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Installer l'éditeur intégré TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Installation de la TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Quitter"
@@ -144,9 +143,9 @@ msgstr "Quitter"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Précédent"
 
@@ -154,8 +153,8 @@ msgstr "< Précédent"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Suivant >"
 
@@ -200,29 +199,29 @@ msgid "Change default repository"
 msgstr "Changer de dépôt par défaut"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Dépôt indiqué sur la ligne de commande"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "Dépôts de packages locaux"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "Dépôts de packages du réseau"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Dépôt de packages distant par défaut"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Choisir le dépôt de packages"
 
@@ -253,7 +252,7 @@ msgid "This will take some time!"
 msgstr "Ceci peut prendre du temps."
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Échec du chargement de la base de données TeX Live distante :"
 
@@ -275,24 +274,23 @@ msgstr ""
 "installée : %s\n"
 "    dépôt : %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Répertoire de destination :"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -308,7 +306,7 @@ msgstr "Répertoire de destination :"
 msgid "Change"
 msgstr "Modifier"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -316,63 +314,21 @@ msgstr ""
 "Le répertoire de destination contiendra votre système TeX Live.\n"
 "Il est fortement recommandé de conserver l'année comme dernière composante."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "Espace disque nécessaire :"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(répertoire par défaut interdit en écriture - veuillez le modifier !)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Entrer le chemin"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "Ok"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Cet écran vous permet de régler quelques options"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -385,88 +341,88 @@ msgstr ""
 "Si vous souhaitez changer quelque chose, revenez en arrière ;\n"
 "sinon, cliquez sur le bouton « Installer »."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Oui"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Non"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Installer"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Aucun"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Seulement les nouveaux"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Tous"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr "Pas de raccourcis"
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr "Menu TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr "Entrée de lanceur"
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Charger"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -478,11 +434,48 @@ msgstr "Charger"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Veuillez choisir un autre miroir."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "Ok"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -497,48 +490,48 @@ msgstr ""
 "    dépôt : %s\n"
 "Veuillez choisir un autre miroir."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Informations générales"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Plate(s)-forme(s) des binaires"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Schéma sélectionné"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Personnalisation avancée"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Installation des collections"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Choix des répertoires"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Options de portabilité"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -547,79 +540,79 @@ msgstr "Options de portabilité"
 msgid "Toggle"
 msgstr "Basculer"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (répertoire TeX principal)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (répertoire des fichiers locaux, etc.)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (répertoire des fichiers générés automatiquement)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (répertoire de la configuration locale)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (répertoire des fichiers personnels)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Options"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Autoriser par défaut l'exécution de certains programmes par \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Générer tous les formats"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Installer la documentation des macros et polices"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Installer les sources des macros et polices"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Créer les liens symboliques dans les répertoires-système"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "Après installation, recevoir les mises à jour par le CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "À propos"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Installer TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Continuer"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 "En cas de problème, essayez de désactiver votre anti-virus durant "
 "l'installation."
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -627,7 +620,7 @@ msgstr ""
 "L'installateur n'a pas les droits d'administrateur ;\n"
 "il ne peut donc installer que pour l'utilisateur actuel."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -636,79 +629,79 @@ msgstr ""
 "« Exécuter en tant qu'administrateur » si vous souhaitez\n"
 "installer pour tous les utilisateurs."
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Changer la valeur de la variable"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Entrer le chemin %s (utiliser ~ pour %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "sélection personnalisée de collections"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Choisir les collections à installer"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Tout désélectionner"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "Créer des liens symboliques dans les répertoires standards"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "Emplacement des binaires"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "Emplacement des pages de man"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "Emplacement des pages info"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Choisir la plate-forme"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Il n'est pas possible de retirer l'architecture principale !"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s parmi %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collections parmi %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(changer d'abord TEXDIR !)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(écriture impossible - changer d'emplacement !)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1607,6 +1600,9 @@ msgstr "Programmes pour le support de Windows seulement"
 msgid "XeTeX and packages"
 msgstr "XeTeX et packages associés"
 
+#~ msgid "Enter path for"
+#~ msgstr "Entrer le chemin"
+
 #~ msgid "Mathematics and science packages"
 #~ msgstr "Packages mathématiques et scientifiques"
 
@@ -2110,7 +2106,8 @@ msgstr "XeTeX et packages associés"
 #~ msgid ""
 #~ "Force the removal of a package even if it is referenced in a collection."
 #~ msgstr ""
-#~ "Forcer la suppression d'un package même s'il est listé dans une collection."
+#~ "Forcer la suppression d'un package même s'il est listé dans une "
+#~ "collection."
 
 #~ msgid "without depends"
 #~ msgstr "sans les dépendances"
diff --git a/Master/tlpkg/translations/it.po b/Master/tlpkg/translations/it.po
index 67cfb0c3e7f..39e0ce25843 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: 2017-11-04 02:22+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2018-02-23 08:42+0100\n"
 "Last-Translator: Marco Pallane <marco.pallante@gmail.com>\n"
 "Language-Team: <>\n"
@@ -12,12 +12,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: install-tl:2387
+#: install-tl:2389
 #, fuzzy
 msgid "Welcome to TeX Live!"
 msgstr "Benvenuto in TeX Live!"
 
-#: install-tl:2390
+#: install-tl:2392
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -34,7 +34,7 @@ msgstr ""
 "La lista dei gruppi è disponibile sul web alla pagina http://tug.org/"
 "usergroups.html."
 
-#: install-tl:2395
+#: install-tl:2397
 #, fuzzy, perl-format
 msgid ""
 "Add %s/texmf-dist/doc/man to MANPATH.\n"
@@ -51,15 +51,14 @@ msgstr ""
 msgid "Installation process"
 msgstr "Installazione"
 
-#: tlpkg/installer/tracked-install.pl:40
+#: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -78,58 +77,58 @@ msgstr "Installazione"
 msgid "Cancel"
 msgstr "Annulla"
 
-#: tlpkg/installer/tracked-install.pl:78
+#: tlpkg/installer/tracked-install.pl:79
 #, fuzzy
 msgid "Scroll back to inspect warnings"
 msgstr "Scorri all'indietro per esaminare i warnings"
 
-#: tlpkg/installer/tracked-install.pl:86
+#: tlpkg/installer/tracked-install.pl:87
 msgid "Finish"
 msgstr "Fine"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Formato pagina predefinito"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Aggiungi le scorciatoie da menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Cambia le associazioni dei file"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Correggere le impostazioni del PATH nel registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Installazione per tutti gli utenti"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Installa il programma TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Installazione di TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Esci"
@@ -139,9 +138,9 @@ msgstr "Esci"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Indietro"
 
@@ -149,8 +148,8 @@ msgstr "< Indietro"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Avanti >"
 
@@ -197,29 +196,29 @@ msgid "Change default repository"
 msgstr "Modifica l'archivio predefinito"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Archivio a riga di comando"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "ARCHIVI LOCALI"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "ARCHIVI DI RETE"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Archivio di rete predefinito"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Scegli l'archivio"
 
@@ -249,7 +248,7 @@ msgid "This will take some time!"
 msgstr "Questa operazione può durare a lungo!"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Impossibile caricare il database remoto di TeX Live:"
 
@@ -271,24 +270,23 @@ msgstr ""
 "  locale: %s\n"
 "archivio: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Percorso di destinazione:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -304,7 +302,7 @@ msgstr "Percorso di destinazione:"
 msgid "Change"
 msgstr "Cambia"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -313,65 +311,23 @@ msgstr ""
 "Raccomandiamo di lasciare l'anno di questa edizione di TeX Live\n"
 "come ultima componente del percorso."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 #, fuzzy
 msgid "disk space required:"
 msgstr "spazio necessario su disco:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, fuzzy
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(default non consentito o senza permessi di scrittura - da cambiare!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Inserisci il percorso per"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "Ok"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Da questa schermata è possibile configurare alcune opzioni"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -384,91 +340,91 @@ msgstr ""
 "Se desiderate modificare qualcosa prima di procedere, tornate indietro,\n"
 "altrimenti premete sul pulsante \"Installa\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Sì"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "No"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Installa"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Nessuno"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Solo nuovi"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Tutti"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "lettera"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 #, fuzzy
 msgid "No shortcuts"
 msgstr "Nessuna abbreviazione"
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 #, fuzzy
 msgid "TeX Live menu"
 msgstr "Menù di TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 #, fuzzy
 msgid "Launcher entry"
 msgstr "Entrata del launcher"
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Carica"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -480,11 +436,48 @@ msgstr "Carica"
 msgid "Warning"
 msgstr "Attenzione"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Scegli un mirror differente."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "Ok"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -499,49 +492,49 @@ msgstr ""
 "  archivio: %s\n"
 "Scegli un mirror differente."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Informazioni di base"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Architetture selezionate"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Schemi selezionati"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Personalizzazioni aggiuntive"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Installazione collezioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Impostazione delle directory"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 #, fuzzy
 msgid "Portable setup"
 msgstr "Allestimento portabile"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -550,74 +543,74 @@ msgstr "Allestimento portabile"
 msgid "Toggle"
 msgstr "Inverti"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (directory principale di TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (directory per i file comuni a tutti gli utenti)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (directory per i dati generati automaticamente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (directory della configurazione per tutti gli utenti)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (directory dei file specifici per ciascun utente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Opzioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 "Consenti l'esecuzione di una ristretta lista di programmi tramite \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Crea tutti i file di formato"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Installa la documentazione per font e macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Installa i sorgenti per font e macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 #, fuzzy
 msgid "Create symlinks in system directories"
 msgstr "Crea i collegamenti simbolici nelle directory di sistema"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "Dopo l'installazione, ottieni gli aggiornamenti dei pacchetti da CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Informazioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Installa TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Continua"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 #, fuzzy
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
@@ -625,7 +618,7 @@ msgstr ""
 "In caso di problemi, prova a disabilitare il tuo antivirus durante "
 "l'installazione."
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 #, fuzzy
 msgid ""
 "The installer does not have adminstrative permissions;\n"
@@ -634,7 +627,7 @@ msgstr ""
 "Il programma di installazione non possiede i permessi di amministrazione;\n"
 "quindi è possibile eseguire l'installazione solo per l'utente attuale."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 #, fuzzy
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
@@ -644,80 +637,80 @@ msgstr ""
 "come amministratore\"\n"
 "per installare per tutti gli utenti."
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Cambia il valore della variabile"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Inserisci il percorso per %s (usa ~ per %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "selezione personalizzata delle collezioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Seleziona le collezioni di pacchetti da installare"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Seleziona Tutto"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Deseleziona Tutto"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "crea i collegamenti simbolici nelle directory standard"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "eseguibili in"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "pagine di manuale in"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "pagine info in"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Seleziona le combinazioni di architetture e sistemi operativi"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Non è possibile rimuovere la piattaforma principale!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s su %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collezioni su %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 #, fuzzy
 msgid "(please change TEXDIR first!)"
 msgstr "(prima è necessario cambiare TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(non si hanno i permessi di scrittura - cambiare il percorso!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 #, fuzzy
 msgid ""
 "Portable option changed;\n"
@@ -1662,6 +1655,9 @@ msgstr "Programmi di supporto solo per Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX e pacchetti"
 
+#~ msgid "Enter path for"
+#~ msgstr "Inserisci il percorso per"
+
 #~ msgid "XML scheme"
 #~ msgstr "Schema XML"
 
diff --git a/Master/tlpkg/translations/ja.po b/Master/tlpkg/translations/ja.po
index 0331e2979d5..1679e0656ec 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2015-05-12 17:27+0900\n"
 "Last-Translator: Koji Yokota <yokota33@gmail.com>\n"
 "Language-Team: Japanese <tldoc@tug.org>\n"
@@ -56,13 +56,12 @@ msgstr "導入プロセス"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -89,49 +88,49 @@ msgstr ""
 msgid "Finish"
 msgstr "終了"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "既定用紙寸法"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "メニューショートカットを追加"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "ファイル関連付けを変更する"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "レジストリの PATH 設定を調整する"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "全ユーザ用に導入"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "TeXworks フロントエンドを導入"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s の導入"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "終了"
@@ -141,9 +140,9 @@ msgstr "終了"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "←戻る"
 
@@ -151,8 +150,8 @@ msgstr "←戻る"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "次へ→"
 
@@ -195,29 +194,29 @@ msgid "Change default repository"
 msgstr "既定リポジトリを変更"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "コマンドラインリポジトリ "
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "ローカルリポジトリ"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "ネットワークリポジトリ"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "既定リモートレポジトリ"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "リポジトリを選択"
 
@@ -246,7 +245,7 @@ msgid "This will take some time!"
 msgstr "これには少し時間がかかります！"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "リモートTeX Liveデータベースを読み込めませんでした:"
 
@@ -268,24 +267,23 @@ msgstr ""
 "ローカル　: %s\n"
 "リポジトリ: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "導入先フォルダ:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -301,7 +299,7 @@ msgstr "導入先フォルダ:"
 msgid "Change"
 msgstr "変更"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -309,63 +307,21 @@ msgstr ""
 "対象フォルダには、導入対象物が入ります。\n"
 "最後尾に年を入れたままにしておくことを強くお勧めします。"
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "必要ディスク領域:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr "（既定値が許されないか書き込み不能です―変更してください！）"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "この変数のパスを入力→"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "OK"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "この画面では、いくつかのオプションを設定することができます。"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -378,88 +334,88 @@ msgstr ""
 "変更したいものがある場合には、前に戻ってください。\n"
 "そうでなければ、「導入」ボタンを押してください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "はい"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "いいえ"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "なし"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "新規のみ"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "全部"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "レター"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "読み込み"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -471,11 +427,48 @@ msgstr "読み込み"
 msgid "Warning"
 msgstr "警告"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "別のミラーを選択してください。"
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "OK"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -490,48 +483,48 @@ msgstr ""
 "　リポジトリ: %s\n"
 "別のミラーを選択してください。"
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "基本情報"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "バイナリシステム"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "選択したスキーム"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "詳細設定"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "導入対象コレクション"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "ディレクトリ設定"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "可搬設定"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -540,77 +533,77 @@ msgstr "可搬設定"
 msgid "Toggle"
 msgstr "入切"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR（TeX主幹ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL（サイト固有ファイル用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR（自動生成データ用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG（ローカル設定用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME（ユーザ固有ファイル用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "オプション"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "\\write18 を用いて制限リスト中のプログラムを実行することを許可"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "フォーマットファイルをすべて生成"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "font と macro の doc ツリーを導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "font と macro のソースツリーを導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "システムディレクトリに symlink を作成する"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "導入後，CTANからパッケージの更新を受け取る"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "このプログラムについて"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "TeX Live の導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "続行"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -618,7 +611,7 @@ msgstr ""
 "本導入プログラムは管理者権限を与えられていません．\n"
 "よって，現ユーザー用にしか導入することができません．"
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -626,79 +619,79 @@ msgstr ""
 "全ユーザー用に導入したい場合には，install-tl-advancedを右クリックして，\n"
 "\"runを管理者として選択してください．"
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "変数の値を変更"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "%s のパスを入力してください（%s を表すには ~ を使用してください）"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "コレクションの任意選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "導入するコレクションを選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "すべてを選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "すべてを非選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "symlink を標準ディレクトリに作成する"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "バイナリリンク先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "man ページリンク先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "info リンク先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "arch-os を選択してください"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "主幹プラットフォームを取り除くことはできません！"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s（全 %s 中）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s コレクション（全 %s コレクション中）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "（先に TEXDIR を変更してください！）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "（既定値では書き込みできません。変更してください！）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1589,6 +1582,9 @@ msgstr "Windows限定サポートプログラム"
 msgid "XeTeX and packages"
 msgstr "XeTeXとパッケージ"
 
+#~ msgid "Enter path for"
+#~ msgstr "この変数のパスを入力→"
+
 #~ msgid "XML scheme"
 #~ msgstr "XMLスキーム"
 
diff --git a/Master/tlpkg/translations/messages.pot b/Master/tlpkg/translations/messages.pot
index f5fdc6aa748..45fdd75cc10 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+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"
@@ -46,13 +46,12 @@ msgstr ""
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -79,49 +78,49 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr ""
@@ -131,9 +130,9 @@ msgstr ""
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr ""
 
@@ -141,8 +140,8 @@ msgstr ""
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr ""
 
@@ -179,29 +178,29 @@ msgid "Change default repository"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr ""
 
@@ -230,7 +229,7 @@ msgid "This will take some time!"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
@@ -248,24 +247,23 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -281,69 +279,27 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -352,88 +308,88 @@ msgid ""
 "otherwise press the \"Install\" button."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -445,11 +401,48 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -459,48 +452,48 @@ msgid ""
 "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -509,161 +502,161 @@ msgstr ""
 msgid "Toggle"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
diff --git a/Master/tlpkg/translations/nl.po b/Master/tlpkg/translations/nl.po
index 7392f89c2cb..a162844ddb1 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2018-03-31 14:09+0200\n"
 "Last-Translator: Siep Kroonenberg <siepo@cybercomm.nl>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -52,13 +52,12 @@ msgstr "Installatie"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -85,49 +84,49 @@ msgstr "Schuif terug om waarschuwingen te inspekteren"
 msgid "Finish"
 msgstr "Sluit af"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Standaard papier-formaat"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Maak TeX Live menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Wijzig bestandstypen"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "PATH aanpassen in registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Installeer voor alle gebruikers"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Installeer TeXworks front-end"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s Installatie"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Stoppen"
@@ -137,9 +136,9 @@ msgstr "Stoppen"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Terug"
 
@@ -147,8 +146,8 @@ msgstr "< Terug"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Volgende >"
 
@@ -193,29 +192,29 @@ msgid "Change default repository"
 msgstr "Verander standaard installatie-bron"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Installatie-bron volgens commando-regel"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKALE INSTALLATIE-BRONNEN"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "ONLINE INSTALLATIE-BRONNEN"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Standaard online installatie-bron"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Selekteer installatie-bron"
 
@@ -244,7 +243,7 @@ msgid "This will take some time!"
 msgstr "Dit gaat even duren!"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Kon de online TeX Live database niet laden:"
 
@@ -266,24 +265,23 @@ msgstr ""
 "  lokaal: %s\n"
 "  installatie-bron:%s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Bestemmings-folder"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -299,7 +297,7 @@ msgstr "Bestemmings-folder"
 msgid "Change"
 msgstr "Wijzig"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -307,63 +305,21 @@ msgstr ""
 "De bestemmings-folder zal TeX Live bevatten.\n"
 "Het wordt sterk aangeraden het jaar aan te houden als laatste component."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "benodigde schijfruimte"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(default niet toegestaan of niet schrijfbaar - aub wijzigen!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Pad voor"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "Ok"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Met dit scherm kunt u enkele opties instellen."
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -376,88 +332,88 @@ msgstr ""
 "Ga terug als u iets wilt wijzigen,\n"
 "zo niet, klik dan op de \"Installeren\" knop."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Ja"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Nee"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Installeren"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Geen"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Alleen nieuw"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Alle"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr "Geen TeX Live menu"
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr "TeX Live menu"
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr "Launcher item"
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Laad"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -469,11 +425,48 @@ msgstr "Laad"
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Kies een andere mirror."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "Ok"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -488,48 +481,48 @@ msgstr ""
 "  installatie-bron:%s\n"
 "Kies een andere mirror."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Basisinformatie"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Platform(s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Gekozen schema"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Verdere verfijning"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Installatie-collecties"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Folders"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Portable setup"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -538,79 +531,79 @@ msgstr "Portable setup"
 msgid "Toggle"
 msgstr "Wijzig"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (hoofd TeX-folder)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (voor lokale stijlen etc.)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (voor automatisch gegenereerde bestanden)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (voor lokale configuratie)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (voor eigen macros etc.)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Opties"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Sta uitvoering van een beperkte lijst programmas toe via \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Genereer alle format bestanden"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Installeer font/macro doc folder"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Installeer font/macro bron folder"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Maak symlinks naar standaard-folders"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "Aktualiseer pakketten vanuit CTAN na installatie"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Info"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Installeer TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 "Probeer in geval van problemen uw antivirus te deaktiveren tijdens de "
 "installatie."
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -618,7 +611,7 @@ msgstr ""
 "Het installatie-programma heeft geen administratieve bevoegdheden;\n"
 "kan daarom alleen voor de huidige gebruiker installeren."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -627,79 +620,79 @@ msgstr ""
 "\"\n"
 "als u voor alle gebruikers wilt installeren."
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Nieuwe waarde"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Pad voor %s (gebruik ~ voor %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "Eigen selektie van collekties"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Kies te installeren collecties"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Kies alles"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Kies niets"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "Maak symlinks naar standaard-folders"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "programma's naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "manpages naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "info naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Kies platform(s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Verwijdering van de hoofd-architektuur niet mogelijk!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s van %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collecties van %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(TEXDIR eerst veranderen!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(geen schrijf-toegang - wijzig!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1592,6 +1585,9 @@ msgstr "Ondersteunende programma's specifiek voor Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX en bijbehorende pakketten"
 
+#~ msgid "Enter path for"
+#~ msgstr "Pad voor"
+
 #~ msgid "Mathematics and science packages"
 #~ msgstr "Wiskundige en wetenschappelijke pakketten"
 
diff --git a/Master/tlpkg/translations/pl.po b/Master/tlpkg/translations/pl.po
index cbe21186b80..12a4a13f5c5 100644
--- a/Master/tlpkg/translations/pl.po
+++ b/Master/tlpkg/translations/pl.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2010\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2018-04-04 19:16+0200\n"
+"Last-Translator: Zofia Walczak <pelagia48@gmail.com>\n"
 "Language-Team: \n"
+"Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.6\n"
-"Last-Translator: Zofia Walczak <pelagia48@gmail.com>\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"Language: pl_PL\n"
 
 #: install-tl:2389
 msgid "Welcome to TeX Live!"
@@ -58,13 +58,12 @@ msgstr "Instalacja w toku"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -91,49 +90,49 @@ msgstr "Przewiń wstecz, aby sprawdzić komunikaty ostrzeżeń"
 msgid "Finish"
 msgstr "Zakończ"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Domyślny rozmiar papieru"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Dodaj menu skrótów"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Zmiana skojarzeń typu plików"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Dostosuj ustawienia PATH w rejestrze"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Instalacja dla wszystkich użytkowników"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Instalacja edytora TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalowanie TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Zakończ"
@@ -143,9 +142,9 @@ msgstr "Zakończ"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "<Cofnij"
 
@@ -153,8 +152,8 @@ msgstr "<Cofnij"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Dalej >"
 
@@ -198,29 +197,29 @@ msgid "Change default repository"
 msgstr "Zmień domyślne repozytorium"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Repozytorium z linii poleceń"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "REPOZYTORIA LOKALNE"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "REPOZYTORIA W SIECI"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Domyślne repozytorium"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Wybierz repozytorium"
 
@@ -249,7 +248,7 @@ msgid "This will take some time!"
 msgstr "To trochę potrwa!"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Nie można wczytać bazy danych TeX Live z sieci:"
 
@@ -271,24 +270,23 @@ msgstr ""
 "         lokalnie: %s\n"
 "repozytorium: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Folder docelowy:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -304,7 +302,7 @@ msgstr "Folder docelowy:"
 msgid "Change"
 msgstr "Zmień"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -312,64 +310,22 @@ msgstr ""
 "Docelowy folder będzie zawierał instalację.\n"
 "Zaleca się, by ostatnim składnikiem był rok wydania."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "wymagana przestrzeń na dysku:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 "(domyślnie niedozwolone lub brak uprawnień do zapisu - proszę zmienić!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Podaj ścieżkę dla"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "Zatwierdź"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Tutaj możesz skonfigurować niektóre ustawienia"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -382,88 +338,88 @@ msgstr ""
 "Jeśli chcesz je zmienić, to cofnij się,\n"
 "w przeciwnym razie naciśnij przycisk \"Zainstaluj\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Tak"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Nie"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Instaluj"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Żaden"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Tylko nowe"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Wszystkie"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr "Brak skrótów"
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr "Menu TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr "Pozycja programu uruchomieniowego"
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Wczytaj"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -475,11 +431,48 @@ msgstr "Wczytaj"
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Proszę wybrać inną kopię zasobów (mirror)."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "Zatwierdź"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -493,48 +486,48 @@ msgstr ""
 "w repozytorium: %s\n"
 "Proszę wybrać inną kopię (mirror) repozytorium."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Informacje podstawowe"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Programy dla systemów operacyjnych"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Wybrany schemat instalacji"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Dalsze ustawienia"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Wybór kolekcji"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Wybór katalogów"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Ustawienia instalacji przenośnej"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -543,77 +536,77 @@ msgstr "Ustawienia instalacji przenośnej"
 msgid "Toggle"
 msgstr "Przełącz"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (główny katalog instalacji TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (katalog stylów, fontó itp. w sieci lokalnej)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (katalog plików generowanych automatycznie)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (katalog dla lokalnych plików konfiguracyjnych)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (katalog dla prywatnych plików użytkownika)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Opcje"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Zezwalaj na uruchomienie wybranych programów via \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Generowanie wszystkich plików formatów"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Instalowanie dokumentacji fontów i makr"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Instalowanie plików źródłowych fontów i makr"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Utwórz dowiązania symboliczne w katalogach systemowych"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "Po instalacji pobierz aktualizacje pakietów z CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "O programie"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Zainstaluj TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Kontynuuj"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr "W razie kłopotów wyłącz na czas instalacji  skaner antywirusowy."
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -621,7 +614,7 @@ msgstr ""
 "Program instalujący uruchomiono bez uprawnień administratora;\n"
 "instalacja tylko dla aktualnego użytkownika."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -630,79 +623,79 @@ msgstr ""
 "\"Uruchom jako administrator\", jeśli instalacja ma być\n"
 "dla wszystkich użytkowników."
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Zmień wartości zmiennych"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Podaj ścieżkę dla %s (użyj ~ dla %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "indywidualny wybór kolekcji"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Wybór kolekcji do zainstalowania"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Wybierz wszystko"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Wyłącz wszystko"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "utwórz dowiązania symboliczne w standardowych folderach"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "programy według"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "strony man według"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "dokumentacje info według"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Wybór systemu operacyjnego"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Nie można usuwać binariów dla głównej platformy!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s spośród %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcji spośród %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(proszę zmienić najpierw TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(domyślnie brak praw do zapisu - proszę zmienić!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1594,3 +1587,6 @@ msgstr "Dodatkowe programy tylko dla Windows"
 #: tlpkg/translations/shortdesc.pl:50
 msgid "XeTeX and packages"
 msgstr "XeTeX i pakiety"
+
+#~ msgid "Enter path for"
+#~ msgstr "Podaj ścieżkę dla"
diff --git a/Master/tlpkg/translations/pt_BR.po b/Master/tlpkg/translations/pt_BR.po
index 7711dd456f2..e62b2e08a0c 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2017-05-06 07:35-0300\n"
 "Last-Translator: Paulo Roberto Massa Cereda <cereda@users.sf.net>\n"
 "Language-Team: Paulo Roberto Massa Cereda <cereda@users.sf.net>\n"
@@ -53,13 +53,12 @@ msgstr "Processo de instalação"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -86,49 +85,49 @@ msgstr ""
 msgid "Finish"
 msgstr "Finalizar"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Tamanho padrão do papel"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Adicionar atalhos de menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Alterar as associações de arquivos"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Ajustar a configuração da variável PATH no registro"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Instalação para todos os usuários"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Instalar o editor TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalação do TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Sair"
@@ -138,9 +137,9 @@ msgstr "Sair"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Anterior"
 
@@ -148,8 +147,8 @@ msgstr "< Anterior"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Próximo >"
 
@@ -194,29 +193,29 @@ msgid "Change default repository"
 msgstr "Alterar repositório padrão"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Repositório de linha de comando"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "REPOSITÓRIOS LOCAIS"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "REPOSITÓRIOS DE REDE"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Repositório remoto padrão"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Selecione repositório"
 
@@ -246,7 +245,7 @@ msgid "This will take some time!"
 msgstr "Isto vai levar algum tempo!"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Não foi possível carregar o banco de dados remoto do TeX Live:"
 
@@ -268,24 +267,23 @@ msgstr ""
 "      local: %s\n"
 "repositório: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Diretório de destino:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -301,7 +299,7 @@ msgstr "Diretório de destino:"
 msgid "Change"
 msgstr "Alterar"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -309,64 +307,22 @@ msgstr ""
 "O diretório de destino conterá a instalação.\n"
 "É altamente recomendável manter o ano como o último componente."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "espaço em disco requerido:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 "(padrão não permitido ou sem permissão de escrita - por favor, altere!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Digite o caminho para"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "Ok"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Esta tela permite que você configure algumas opções"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -380,88 +336,88 @@ msgstr ""
 "às etapas anteriores; caso contrário, pressione o\n"
 "botão  \"Instalar\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Sim"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Não"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Instalar"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Nenhum"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Apenas novos"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Todos"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "carta"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr "Sem atalhos"
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr "Menu TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr "Entrada do lançador"
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Carregar"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -473,11 +429,48 @@ msgstr "Carregar"
 msgid "Warning"
 msgstr "Aviso"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Por favor, selecione um espelho diferente."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "Ok"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -492,48 +485,48 @@ msgstr ""
 "  repositório: %s\n"
 "Por favor, selecione um espelho diferente."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Informação básica"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Sistema(s) binário(s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Esquema selecionado"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Personalização adicional"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Coleções da instalação"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Configuração de diretório"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Configuração portátil"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -542,79 +535,79 @@ msgstr "Configuração portátil"
 msgid "Toggle"
 msgstr "Alternar"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (o diretório TeX principal)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (diretório para arquivos locais)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (diretório para dados gerados automaticamente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (diretório para configuração local)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (diretório para arquivos específicos do usuário)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Opções"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Permitir execução de lista restrita de programas através de \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Criar todos os formatos de arquivos"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Instalar árvore de documentação de fontes/macros"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Instalar a árvore de código-fonte de fontes/macros"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Criar links simbólicos nos diretórios do sistema"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "Após a instalação, obtenha atualizações de pacotes a partir de CTAN."
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Sobre"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Instalar o TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Continuar"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 "Em caso de problema, tente desabilitar seu programa antivírus durante a "
 "instalação."
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -622,7 +615,7 @@ msgstr ""
 "O instalador não possui permissões administrativas.\n"
 "Portanto, ele poderá instalar TeX Live apenas para o usuário atual."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -631,79 +624,79 @@ msgstr ""
 "\"executar como administrador\" se você desejar instalar TeX Live\n"
 "para todos os usuários."
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Alterar valor da variável"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Digite o caminho para %s (use ~ para %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "seleção personalizada de coleções"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Selecione as coleções a serem instaladas"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Remover seleção de tudo"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "criar links simbólicos nos diretórios padrão"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "binários para"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "páginas de manual para"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "informação para"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Selecionar arquitetura do sistema operacional"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Não é possível realizar a remoção da plataforma principal!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s de %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s coleções de %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(por favor, altere TEXDIR primeiro!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(padrão não tem permissão de escrita - por favor, altere!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1602,6 +1595,9 @@ msgstr "Programas de suporte exclusivos para Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX e pacotes"
 
+#~ msgid "Enter path for"
+#~ msgstr "Digite o caminho para"
+
 #~ msgid "Mathematics and science packages"
 #~ msgstr "Pacotes para matemática e ciência"
 
diff --git a/Master/tlpkg/translations/ru.po b/Master/tlpkg/translations/ru.po
index 00322b41c1f..65c51f2d87a 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2017-05-05 07:57+0800\n"
 "Last-Translator: Vladimir Lomov <irk.translator@yandex.ru>\n"
 "Language-Team: Russian <tldoc@tug.org>\n"
@@ -56,13 +56,12 @@ msgstr "Процесс установки"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -89,49 +88,49 @@ msgstr ""
 msgid "Finish"
 msgstr "Закончить"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Формат страницы по умолчанию"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Добавить в меню «Пуск»"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Изменить привязку файлов"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Добавить в переменную PATH"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Доступно для всех пользователей"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Установить редактор TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Установка TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Выход"
@@ -141,9 +140,9 @@ msgstr "Выход"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Назад"
 
@@ -151,8 +150,8 @@ msgstr "< Назад"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Далее >"
 
@@ -196,29 +195,29 @@ msgid "Change default repository"
 msgstr "Изменить репозиторий по умолчанию"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Репозиторий указанный в командной строке"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "ЛОКАЛЬНЫЕ РЕПОЗИТОРИИ"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "СЕТЕВЫЕ РЕПОЗИТОРИИ"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Сетевой репозиторий по умолчанию"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Выбрать репозиторий"
 
@@ -247,7 +246,7 @@ msgid "This will take some time!"
 msgstr "Это займёт некоторое время!"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Невозможно загрузить сетевую базу данных TeX Live:"
 
@@ -269,24 +268,23 @@ msgstr ""
 "    локальная: %s\n"
 "в репозитории: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Целевой каталог:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -302,7 +300,7 @@ msgstr "Целевой каталог:"
 msgid "Change"
 msgstr "Изменить"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -310,65 +308,23 @@ msgstr ""
 "В целевом каталоге будут размещены установленные файлы.\n"
 "Настоятельно рекомендуем сохранить год выпуска дистрибутива в его названии."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "требуется места на диске:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 "(нет доступа или прав на запись для каталога по умолчанию — задайте другое "
 "значение!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Введите путь для"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "Ок"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "В этом окне можно настроить некоторые параметры"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -381,88 +337,88 @@ msgstr ""
 "Если нужно что-то изменить, нажмите кнопку «Назад»,\n"
 "если всё в порядке, нажмите кнопку «Установить»."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Да"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Нет"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Установить"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Нет"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Только новые"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Все"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "А4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "Letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr "Не создавать ярлыки"
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr "Меню TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr "Только ярлыки"
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Загрузить"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -474,11 +430,48 @@ msgstr "Загрузить"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Выберите другое зеркало."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "Ок"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -493,48 +486,48 @@ msgstr ""
 "в репозитории: %s\n"
 "Выберите другое зеркало."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Базовая настройка"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Программы для систем(ы)"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Выбранная схема"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Дополнительные настройки"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Коллекции для установки"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Подготовка каталогов"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Настройка для мобильного использования"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -543,78 +536,78 @@ msgstr "Настройка для мобильного использовани�
 msgid "Toggle"
 msgstr "Переключить"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (основной каталог TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (системный каталог для локальных файлов)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (системный каталог для автоматически создаваемых данных)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (системный каталог для локальных настроек)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (каталог для личных файлов пользователей)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Параметры"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Разрешить выполнение ограниченного набора программ через \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Создать все форматные файлы"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Установить дерево с документацией font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Установить дерево исходных файлов font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Создать символьные ссылки в системных каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "После установки, получайте обновления пакетов с CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "О программе"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Установить TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Продолжить"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 "Если возникнут проблемы при установке попробуйте отключить ваш антивирус."
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -622,7 +615,7 @@ msgstr ""
 "Программа установки запущена без прав администратора,\n"
 "установка будет выполнена только для текущего пользователя."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -630,79 +623,79 @@ msgstr ""
 "Чтобы установить для всех пользователей, нажмите правой кнопкой\n"
 "мыши на install-tl-advanced и выберите «Запуск от имени администратора»."
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Изменить значение переменной"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Введите путь для %s (используйте ~ для %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "выбор коллекций"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Выберите устанавливаемые коллекции"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Выбрать всё"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Снять выделение"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "создать символьные ссылки в стандартных каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "программы в"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "страницы man в"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "страницы info в"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Выберите архитектуру-ОС"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Удаление основной архитектуры невозможно!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s из %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s коллекций из %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(измените сначала TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(нет прав на запись в каталог по умолчанию — измените!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1595,6 +1588,9 @@ msgstr "Вспомогательные программы, только для W
 msgid "XeTeX and packages"
 msgstr "XeTeX и пакеты"
 
+#~ msgid "Enter path for"
+#~ msgstr "Введите путь для"
+
 #~ msgid "Mathematics and science packages"
 #~ msgstr "Математические и научные пакеты"
 
diff --git a/Master/tlpkg/translations/sk.po b/Master/tlpkg/translations/sk.po
index ed330ae760d..69fa016b116 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2017-05-08 23:22+0200\n"
 "Last-Translator: Ján Buša <jan.busa@tuke.sk>\n"
 "Language-Team: tex-live@tug.org\n"
@@ -52,13 +52,12 @@ msgstr "Proces inštalácie"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -86,49 +85,49 @@ msgid "Finish"
 msgstr "Dokončiť"
 
 # Slovak translation update - Jan Busa 02/05/15.
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Predvolený rozmer papiera"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Pridať skratky ponuky"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Zmeniť priradenia súborov"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Upraviť nastavenie PATH v registroch"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Inštalácia pre všetkých použí­vateľov"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Nainštalovať pomocný program TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Inštalácia TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Ukončiť"
@@ -138,9 +137,9 @@ msgstr "Ukončiť"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Späť"
 
@@ -148,8 +147,8 @@ msgstr "< Späť"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Ďalej >"
 
@@ -193,29 +192,29 @@ msgid "Change default repository"
 msgstr "Zmeniť predvolenú schránku"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Schránka príkazového riadku"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKÁLNE SCHRÁNKY"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "SIEŤOVÉ SCHRÁNKY"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Predvolená vzdialená schránka"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Zvoliť schránku"
 
@@ -244,7 +243,7 @@ msgid "This will take some time!"
 msgstr "Bude to trvať istý čas!"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Nepodarilo sa načí­tať vzdialenú databázu TeX Live:"
 
@@ -266,24 +265,23 @@ msgstr ""
 "     lokálne: %s\n"
 "schránka: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Cieľový adresár:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -299,7 +297,7 @@ msgstr "Cieľový adresár:"
 msgid "Change"
 msgstr "Zmeniť"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -307,65 +305,23 @@ msgstr ""
 "Cieľový adresár bude obsahovať inštaláciu.\n"
 "Dôrazne vám odporúčame ponechať rok ako poslednú zložku."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "požadovaný diskový priestor:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 "(predvoľba nie je povolená alebo je chránená proti zápisu - zmeňte ju, prosí­"
 "m!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Vložte cestu pre"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "OK"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Táto obrazovka vám umožní­ nakonfigurovať niektoré voľby"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -378,88 +334,88 @@ msgstr ""
 "Ak si prajete niečo zmeniť, prejdite, prosí­m späť,\n"
 "v opačnom prí­pade stlačte tlačidlo \"Nainštaluj\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Áno"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Nie"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Nainštalovať"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Žiaden"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Len nové"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Všetky"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr "Žiadne skratky"
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr "Menu TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr "Položka zavádzača"
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Načí­tať"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -471,11 +427,48 @@ msgstr "Načí­tať"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Zvoľte, prosí­m, iné zrkadlo."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "OK"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -490,48 +483,48 @@ msgstr ""
 "  schránka: %s\n"
 "Zvoľte, prosí­m, iné zrkadlo."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Základné informácie"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Binárny(e) systém(y)"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Zvolená schéma"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Ďalšie prispôsobenie"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Inštalačné kolekcie"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Nastavenie adresára"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Prenosné nastavenie"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -540,80 +533,80 @@ msgstr "Prenosné nastavenie"
 msgid "Toggle"
 msgstr "Prepnúť"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (hlavný TeXovský adresár)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (adresár na umiestnenie lokálnych súborov)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (adresár vygenerovaných súborov)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (adresár pre lokálnu konfiguráciu)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (adresár uží­vateľských súborov)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Voľby"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 "Umožniť vykonanie všeobecne neprí­stupných zoznamov programov prostrední­ctvom "
 "\\write 18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Vytvoriť všetky formátové súbory"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Nainštalovať strom dokumentácie fontov/makier"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Nainštalovať strom zdrojových súborov fontov/makier"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Vytvoriť symbolické odkazy v systémových adresároch"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "Po inštalácii aktualizujte balí­ky z CTANu"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "O programe"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Nainštalovať TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Pokračovať"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 "V prípade problémov skúste počas inštalácie vypnúť svoj antivírusový program."
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -621,7 +614,7 @@ msgstr ""
 "Inštalátor nemá administrátorské právomoci;\n"
 "preto môže inštalovať len pre aktuálneho použí­vateľa."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -631,79 +624,79 @@ msgstr ""
 " na  install-tl-advanced a zvoľte \"run as administrator/spustiť ako "
 "administrátor\". "
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Zmeniť hodnotu premennej"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Vložte cestu pre %s (namiesto %s použite ~ )"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "použí­vateľská voľba zbierok"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Zvoliť kolekcie, ktore majú byť nainštalované."
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Zvoliť všetky"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Zrušiť všetky voľby"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "vytvoriť symbolické linky v štandardných adresároch"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "binárky do"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "dokumentáciu manpages do"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "informáciu do"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Zvoliť architektúru resp. operačný systém"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Odstránenie hlavnej platformy nie je možné!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcií­ z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(zmeňte najprv TEXDIR, prosí­m!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(predvolené miesto neumožňuje zápis - zmeňte, prosí­m!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1598,6 +1591,9 @@ msgstr "Podporné programy len pre Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX a balí­ky"
 
+#~ msgid "Enter path for"
+#~ msgstr "Vložte cestu pre"
+
 #~ msgid "Mathematics and science packages"
 #~ msgstr "Matematické a vedecké balíky"
 
diff --git a/Master/tlpkg/translations/sl.po b/Master/tlpkg/translations/sl.po
index 39ea2f61436..b1cb87f2173 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2017-04-24 11:53+0200\n"
 "Last-Translator: Mojca Miklavec <mojca.miklavec.lists@gmail.com>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -54,13 +54,12 @@ msgstr "Potek namestitve"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -87,18 +86,18 @@ msgstr ""
 msgid "Finish"
 msgstr "Konec"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Privzet format papirja"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Dodaj menijske bližnjice"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
@@ -106,32 +105,32 @@ msgstr "Dodaj menijske bližnjice"
 msgid "Change file associations"
 msgstr "Spremeni asociacije končnic datotek"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 #, fuzzy
 msgid "Adjust PATH setting in registry"
 msgstr "Nastavi pot (PATH) v registru"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Namestitev za vse uporabnike"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Namesti urejevalnik TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Namestitev TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Izhod"
@@ -141,9 +140,9 @@ msgstr "Izhod"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Nazaj"
 
@@ -151,8 +150,8 @@ msgstr "< Nazaj"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Naprej >"
 
@@ -197,23 +196,23 @@ msgid "Change default repository"
 msgstr "Zamenjaj privzeti repozitorij"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 #, fuzzy
 msgid "Command line repository"
 msgstr "Repozitorij za uporabo v ukazni vrstici"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKALNI REPOZITORIJI"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "MREŽNI REPOZITORIJI"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 #, fuzzy
@@ -221,7 +220,7 @@ msgid "Default remote repository"
 msgstr "Privzeti spletni repozitorij"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Izberi repozitorij"
 
@@ -251,7 +250,7 @@ msgid "This will take some time!"
 msgstr "To utegne trajati nekaj časa."
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 #, fuzzy
 msgid "Could not load remote TeX Live Database:"
 msgstr "Ni bilo mogoče naložiti oddaljene baze paketkov za TeX Live:"
@@ -274,24 +273,23 @@ msgstr ""
 "nameščena verzija: %s\n"
 "verzija na strežniku: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Ciljni imenik:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -307,7 +305,7 @@ msgstr "Ciljni imenik:"
 msgid "Change"
 msgstr "Spremeni"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 #, fuzzy
 msgid ""
 "The destination folder will contain the installation.\n"
@@ -316,64 +314,22 @@ msgstr ""
 "Namestitev bo opravljena v ciljni imenik.\n"
 "Priporočljivo je uporabiti letnico na koncu imena."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 #, fuzzy
 msgid "disk space required:"
 msgstr "prostor na disku:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(nimate pravice za pisanje v ta direktorij - prosim spremenite ga!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Nastavite pot do"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "V redu"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Ta zaslon omogoča nastavitev nekaterih opcij"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -386,90 +342,90 @@ msgstr ""
 "Če bi radi karkoli spremenili, se vrnite nazaj,\n"
 "sicer pritisnite gumb \"Namesti\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Da"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Ne"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Namesti"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 #, fuzzy
 msgid "None"
 msgstr "Brez"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Samo nove"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Vse"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr "Ni bližnjic"
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 #, fuzzy
 msgid "Launcher entry"
 msgstr "Ikona v hitri zagonski vrstici"
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Naloži"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -481,12 +437,49 @@ msgstr "Naloži"
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 #, fuzzy
 msgid "Please select a different mirror."
 msgstr "Prosimo izberite drugi zrcalni strežnik."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "V redu"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -500,48 +493,48 @@ msgstr ""
 "verzija na strežniku: %s\n"
 "Prosimo izberite drugi zrcalni strežnik."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Osnovne nastavitve"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Izbrani operacijski sistemi in arhitekture"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Izbrana shema"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Napredne nastavitve"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Izbrane zbirke paketov"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Nastavitve imenikov"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Prenosljiva namestitev"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -550,79 +543,79 @@ msgstr "Prenosljiva namestitev"
 msgid "Toggle"
 msgstr "Vključi/Izključi"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (vrhnji TeX direktorij)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (lokalne datoteke)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (samodejno generirane datoteke)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (lokalna konfiguracija)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (uporabnikove datoteke)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Možnosti"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Dovoli izvajanje omejenega števila programov z \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Generiraj vse formate"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Namesti dokumentacijo"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Namesti izvorno kodo"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Namesti simbolne povezave v sistemske mape"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "Po namestitvi prenesi posodobitve iz CTAN-a"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "O programu"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Namesti TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 "V primeru težav poskusite med namestitvijo začasno izklopiti protivirusni "
 "program."
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 #, fuzzy
 msgid ""
 "The installer does not have adminstrative permissions;\n"
@@ -631,7 +624,7 @@ msgstr ""
 "Namestitveni program nima administratorskih pravic,\n"
 "zato lahko TeX Live namesti le za trenutnega uporabnika."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -639,80 +632,80 @@ msgstr ""
 "Z desnim klikom na 'install-tl-advanced' izberite \"Run as administrator\",\n"
 "če želite namestiti program za vse uporabnike."
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Nova vrednost spremenljivke"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, fuzzy, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Nastavite pot do %s (uporabite ~ za %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "namestitev paketov po izbiri"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Zbirke, ki naj se namestijo"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Briši izbor"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "ustvari simbolne povezave v sistemskih imenikih"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "binarne datoteke v"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "'man' strani v"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "info strani v"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Izbrane platforme"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 #, fuzzy
 msgid "Removals of the main platform not possible!"
 msgstr "Odstranitev arhitekture, na kateri teče računalnik, ni mogoča."
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s od %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s zbirk od %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(Spremenite TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(Spremenite imenik - pisanje v izbrani imenik je zaščiteno!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1662,6 +1655,9 @@ msgstr "Programi za MS Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX s paketi"
 
+#~ msgid "Enter path for"
+#~ msgstr "Nastavite pot do"
+
 #~ msgid "Mathematics and science packages"
 #~ msgstr "Paketi za matematiko in naravoslovje"
 
diff --git a/Master/tlpkg/translations/sr.po b/Master/tlpkg/translations/sr.po
index 5b71be6e338..fd99fb84898 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2018-04-04 23:06+0300\n"
 "Last-Translator: Nikola Lečić <nikola.lecic@anthesphoria.net>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -57,13 +57,12 @@ msgstr "Процес инсталације"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -90,49 +89,49 @@ msgstr "Скролујте навише да бисте прегледали у�
 msgid "Finish"
 msgstr "Заврши"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Подразумевана величина папира"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Додати пречице у менију"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Повежи типове фајлова са одговарајућим програмима"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Подеси PATH вредност у Registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Инсталација за све кориснике"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Инсталирај специјализовани едитор TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s: инсталација"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Напусти програм"
@@ -142,9 +141,9 @@ msgstr "Напусти програм"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Назад"
 
@@ -152,8 +151,8 @@ msgstr "< Назад"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Напред >"
 
@@ -198,29 +197,29 @@ msgid "Change default repository"
 msgstr "Промена подразумеваног репозиторијума"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Репозиторијум са командне линије"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "ЛОКАЛНИ РЕПОЗИТОРИЈУМИ"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "МРЕЖНИ РЕПОЗИТОРИЈУМИ"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Подразумевани удаљени репозиторијум"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Изаберите репозиторијум"
 
@@ -249,7 +248,7 @@ msgid "This will take some time!"
 msgstr "Ово ће потрајати неко време!"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Учитавање удаљене TeX Live базе података није успело:"
 
@@ -271,24 +270,23 @@ msgstr ""
 "          локална верзија: %s\n"
 "верзија са репозиторијума: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Циљни директоријум:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -304,7 +302,7 @@ msgstr "Циљни директоријум:"
 msgid "Change"
 msgstr "Промени"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -312,63 +310,21 @@ msgstr ""
 "Директоријум у који ће се сместити инсталирани материјал.\n"
 "Препоручујемо да задржите годину као последњи члан."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "потребан простор на диску:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(подразумевани директоријум је неуписив - промените га!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Унесите путању за"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "У реду"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "На овом екрану можете да подесите неке параметре"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -381,88 +337,88 @@ msgstr ""
 "Ако желите да нешто промените, вратите се назад,\n"
 "иначе притисните дугме „Инсталирај“."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "да"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "не"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Инсталирај"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Ништа"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Само нови"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Све"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr "Без пречица"
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr "TeX Live у Start менију"
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr "Покретач (launcher)"
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Учитај"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -474,11 +430,48 @@ msgstr "Учитај"
 msgid "Warning"
 msgstr "Упозорење"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Изаберите друго огледало (mirror)."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "У реду"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -493,48 +486,48 @@ msgstr ""
 "верзија са репозиторијума: %s\n"
 "Молимо Вас да изаберете друго огледало (mirror)."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Основни подаци"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Платформе (архитектуре и оперативни системи)"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Изабрана шема"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Додатна подешавања"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Колекције пакета и програма"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Подешавање директоријума"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Преносива инсталација"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -543,79 +536,79 @@ msgstr "Преносива инсталација"
 msgid "Toggle"
 msgstr "Обрни"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (главни TeX директоријум)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (директоријум за општеважеће локалне фајлове)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (директоријум за аутоматски направљене податке)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (директоријум за локална подешавања)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (директоријум за корисникове фајлове)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Подешавања"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Дозволи покретање ограничене листе програма путем \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Направи све фајлове са форматима"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Инсталирај документацију за фонтове и макрое"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Инсталирај изворни код фонтова и макроа"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Направи симболичке линкове у системским директоријумима"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "После инсталације обнављати пакете преко CTAN-а"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "О програму"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Инсталирај TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Продужити"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 "Ако се појаве проблеми, покушајте да искључите антивирусни програм током "
 "инсталације."
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -624,7 +617,7 @@ msgstr ""
 "за тренутног корисника зато што нема системска\n"
 "овлашћења."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -633,81 +626,81 @@ msgstr ""
 "\"run as administrator\" (\"покрени као администратор\") ако желите\n"
 "да инсталација важи за све кориснике."
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Промена вредности променљиве"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Унесите путању за %s (употребите ~ као замену за %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "произвољан избор колекција"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Изаберите колекције које ће бити инсталиране"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Изабери све"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Уклони све ознаке"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "Направи симболичке линкове у стандардним директоријумима"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "Стави бинарне фајлове у"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "Стави man странице у"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "Стави info странице у"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr ""
 "Изаберите платформу\n"
 "(архитектура - оперативни систем)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Уклањање главне платформе није могуће!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s од укупно %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s колекција од укупно %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(прво промените TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(није могуће уписивање на подразумевану локацију - промените је!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1603,6 +1596,9 @@ msgstr "Помоћни програми за Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX и повезани пакети"
 
+#~ msgid "Enter path for"
+#~ msgstr "Унесите путању за"
+
 #~ msgid "Mathematics and science packages"
 #~ msgstr "Математички и научни пакети"
 
diff --git a/Master/tlpkg/translations/uk.po b/Master/tlpkg/translations/uk.po
index 602e0c7e428..e46a0bb4d84 100644
--- a/Master/tlpkg/translations/uk.po
+++ b/Master/tlpkg/translations/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2010\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+0200\n"
 "PO-Revision-Date: 2013-08-07 08:27+0300\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <andriykopanytsia@gmail.com>\n"
@@ -56,13 +56,12 @@ msgstr "Процес установки"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -89,49 +88,49 @@ msgstr ""
 msgid "Finish"
 msgstr "Завершити"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Типовий розмір паперу"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Додати ярлики у меню"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Змінити асоціації файлів"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Додати параметр PATH у реєстр"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Встановити для усіх користувачів"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Установити редактор TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Встановлення TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Вийти"
@@ -141,9 +140,9 @@ msgstr "Вийти"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Назад"
 
@@ -151,8 +150,8 @@ msgstr "< Назад"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Вперед >"
 
@@ -195,29 +194,29 @@ msgid "Change default repository"
 msgstr "Змінити типове сховище"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Сховище з командного рядка"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "ЛОКАЛЬНІ СХОВИЩА"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "МЕРЕЖНІ СХОВИЩА"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "ТИПОВЕ ВІДДАЛЕНЕ СХОВИЩЕ"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Вибрати сховище"
 
@@ -246,7 +245,7 @@ msgid "This will take some time!"
 msgstr "Це займе деякий час!"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Неможливо завантажити віддалену базу даних  TeX Live:"
 
@@ -268,24 +267,23 @@ msgstr ""
 "     локальна: %s\n"
 "у сховищі: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Цільовий каталог:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -301,7 +299,7 @@ msgstr "Цільовий каталог:"
 msgid "Change"
 msgstr "Змінити"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -309,64 +307,22 @@ msgstr ""
 "Цільовий каталог буде  містити установку.\n"
 "Наполегливо рекомендується залишити рік, як останню компоненту."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "потрібний простір на диску:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 "(нема доступу або нема дозволу на запис у типовий каталог - змініть його!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Ввести шлях для"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "Гаразд"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Цей екран дозволяє вам налаштувати деякі параметри"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -379,88 +335,88 @@ msgstr ""
 "Якщо ви хочете щось змінити, натисніть кнопку „Назад“,\n"
 "інакше натисніть кнопку \"Встановити\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Так"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Ні"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Встановити"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Нічого"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Тільки нові"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Усі"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Завантажити"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -472,11 +428,48 @@ msgstr "Завантажити"
 msgid "Warning"
 msgstr "Попередження"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Будь ласка, виберіть інше дзеркало."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "Гаразд"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -491,48 +484,48 @@ msgstr ""
 "  у сховищі: %s\n"
 "Будь ласка, виберіть інше дзеркало."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Основна інформація"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Програми для систем(и)"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Вибрана схема"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Додаткові налаштування"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr "Збірки для установки"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Установки каталогів"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Портована версія"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -541,77 +534,77 @@ msgstr "Портована версія"
 msgid "Toggle"
 msgstr "Перемкнути"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (основний каталог TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (каталог для локальних файлів під сайти)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (каталог для автоматично створюваних даних)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (каталог для локальних налаштувань)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (каталог для власних файлів користувача)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Параметри"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Дозволити виконання обмеженого списку програм через \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Створити усі форматні файли"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Установити дерево документації шрифтів і макросів"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Установити дерево вихідних кодів шрифтів і макросів"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Створити символічні посилання у системних каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr "Після встановлення отримуйте оновлення пакунків із CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Про"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Встановити TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr "Продовжити"
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -619,7 +612,7 @@ msgstr ""
 "Програма установки запущена без адміністративних прав;\n"
 "тому установка можлива лише для поточного користувача."
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -628,79 +621,79 @@ msgstr ""
 "миші\n"
 " на install-tl-advanced та виберіть \"запустити як адміністратор\""
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Змінити значення змінної"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Введіть шлях для %s (використовуйте ~ для %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "власний вибір збірок"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Виберіть збірки для встановлення"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Вибрати усі"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Зняти виділення"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "створити символічні посилання у стандартних каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "програми у"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "сторінки man у"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "сторінки info у "
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Виберіть архітектуру ОС"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Вилучення основної платформи неможливе!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s із %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s збірки(ок) із %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(будь ласка, спершу змініть TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(немає прав на запис у типовий каталог - змініть це!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1578,6 +1571,9 @@ msgstr "Додаткові програми лише під Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX та пакунки"
 
+#~ msgid "Enter path for"
+#~ msgstr "Ввести шлях для"
+
 #~ msgid "XML scheme"
 #~ msgstr "схема XML"
 
diff --git a/Master/tlpkg/translations/vi.po b/Master/tlpkg/translations/vi.po
index 2640660b5fd..b32f79e77b3 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+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"
@@ -50,13 +50,12 @@ msgstr "Tiến trình cài đặt"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -83,49 +82,49 @@ msgstr ""
 msgid "Finish"
 msgstr "Kết thúc"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr "Kiểu giấy mặc định"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr "Thêm liên kết nhanh vào menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "Đổi tương ứng tập tin - chương trình"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "Điều chỉnh đường dẫn (biến PATH) trong registry hệ thống"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "Cài đặt cho mọi người dùng trên máy"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "Cài đặt trình soạn thảo TeXworks"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Cài đặt TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Thoát"
@@ -135,9 +134,9 @@ msgstr "Thoát"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< Quay lại"
 
@@ -145,8 +144,8 @@ msgstr "< Quay lại"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "Tiếp theo >"
 
@@ -183,29 +182,29 @@ msgid "Change default repository"
 msgstr "Thay đổi nguồn mặc định"
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr "Nguồn bằng dòng lệnh"
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr "NGUỒN TRÊN MÁY"
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr "NGUỒN TỪ MẠNG"
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "Nguồn cài đặt mặc định từ internet"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr "Chọn nguồn"
 
@@ -234,7 +233,7 @@ msgid "This will take some time!"
 msgstr "Sẽ tốn ít thời gian!"
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr "Không thể nạp dữ liệu TeX Live từ mạng:"
 
@@ -256,24 +255,23 @@ msgstr ""
 "      trên máy: %s\n"
 "nguồn cài đặt: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "Cài đặt vào thư mục:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -289,7 +287,7 @@ msgstr "Cài đặt vào thư mục:"
 msgid "Change"
 msgstr "Thay đổi"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -298,63 +296,21 @@ msgstr ""
 "Khuyến cáo: bạn nên để năm (ví dụ: 2009, 2008) vào cuối đường dẫn để phân "
 "biệt các bộ cài đặt khác nhau."
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 msgid "disk space required:"
 msgstr "dung lượng đĩa cần thiết:"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(mặc định không cho phép hoặc không ghi được - hãy đổi lại!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "Nhập đường dẫn cho"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "Đồng ý"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "Cửa sổ này cho phép bạn thay đổi vài tùy chọn"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -367,88 +323,88 @@ msgstr ""
 "Nếu bạn muốn thay đổi, hãy quay lại,\n"
 "còn không, hãy chọn \"Cài đặt\" để bắt đầu."
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "Đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "Không đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Cài đặt"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Không"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Chỉ cái mới"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Tất cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "thư"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "Nạp"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -460,11 +416,48 @@ msgstr "Nạp"
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr "Vui lòng chọn mirror khác."
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "Đồng ý"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -478,48 +471,48 @@ msgstr ""
 "chọn từ mạng: %s\n"
 "Bạn hãy chọn nguồn cài đặt khác."
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "Thông tin cơ bản"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "Hệ thống nhị phân"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "Nhóm đã chọn"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "Tùy chỉnh khác"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "Thiết lập thư mục"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr "Cài đặt linh hoạt (có thể dùng ở máy khác)"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -528,165 +521,165 @@ msgstr "Cài đặt linh hoạt (có thể dùng ở máy khác)"
 msgid "Toggle"
 msgstr "Hoán đổi"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (thư mục TeX chính)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr ""
 "TEXMFLOCAL (thư mục cho các gói, phần bổ sung cho TeX; thư mục này dành cho "
 "hệ thống TeX ở địa phương)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr ""
 "TEXMFSYSVAR (thư mục cho các tập tin tạm thời được sinh ra khi biên dịch tài "
 "liệu)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (thư mục cho cấu hình cục bộ)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 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:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Cho phép thực thi một số chương trình của hệ thống bằng \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "Tạo mọi tập tin định dạng (TeX format)"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "Cài đặt tài liệu cho font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "Cài đặt mã nguồn của font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "Tạo liên kết vào các thư mục hệ thống"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Giới thiệu"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "Cài đặt TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "Đổi giá trị biến"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Nhập đường dẫn cho %s (dùng ký tự ~ để chỉ %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr "tự chọn các nhóm"
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "Chọn nhóm sẽ được cài đặt"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "Chọn tất cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "Không chọn gì cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "tạo liên kết trong thư mục chuẩn"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "tập tin thi hành vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "tập tin hướng dẫn (man) vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "tập tin hướng dẫn (info) vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "Chọn kiểu hệ thống"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Không thể gỡ bỏ cài đặt cho hệ thống chính!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s trên %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s nhóm trong tổng số %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(vui lòng đổi thư mục TEXDIR trước!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(mặc định không ghi được - vui lòng đổi!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1562,6 +1555,9 @@ msgstr ""
 msgid "XeTeX and packages"
 msgstr ""
 
+#~ msgid "Enter path for"
+#~ msgstr "Nhập đường dẫn cho"
+
 #~ msgid "XML scheme"
 #~ msgstr "nhóm XML"
 
diff --git a/Master/tlpkg/translations/zh_CN.po b/Master/tlpkg/translations/zh_CN.po
index 9e814d23064..c3a283b7c27 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+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"
@@ -46,13 +46,12 @@ msgstr "安装过程"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -79,50 +78,50 @@ msgstr ""
 msgid "Finish"
 msgstr "完成"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 #, fuzzy
 msgid "Default paper size"
 msgstr "缺省的纸张给"
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr "修改文件关联"
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr "修改注册表中的 PATH 设置"
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 msgid "Installation for all users"
 msgstr "为所有用户安装"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Install TeXworks front end"
 msgstr "安装 TeXworks 前端"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s 安装"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "退出"
@@ -132,9 +131,9 @@ msgstr "退出"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr "< 上一步"
 
@@ -142,8 +141,8 @@ msgstr "< 上一步"
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr "下一步 >"
 
@@ -180,29 +179,29 @@ msgid "Change default repository"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr "缺省的网络软件包仓库"
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr ""
 
@@ -231,7 +230,7 @@ msgid "This will take some time!"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
@@ -249,24 +248,23 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr "目的文件夹:"
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -282,7 +280,7 @@ msgstr "目的文件夹:"
 msgid "Change"
 msgstr "修改"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -290,64 +288,22 @@ msgstr ""
 "将包含整个安装的目的文件夹。\n"
 "强烈建议以年份作为最后的目录项。"
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 #, fuzzy
 msgid "disk space required:"
 msgstr "需要的磁盘空间"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "输入路径变量"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "确定"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr "这个界面允许你配置某些选项"
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -359,88 +315,88 @@ msgstr ""
 "将使用下列选项。\n"
 "如果你还想修改什么请后退，否则点击“安装”按钮。"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "是"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "安装"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "无"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "只有新的"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "全部的"
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr "载入"
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -452,11 +408,48 @@ msgstr "载入"
 msgid "Warning"
 msgstr "警告"
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "确定"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -466,48 +459,48 @@ msgid ""
 "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "基本信息"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "二进制系统"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "选择安装方案"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "进一步定制"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "目录设置"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -516,162 +509,162 @@ msgstr ""
 msgid "Toggle"
 msgstr "切换"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (主 TeX 目录)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (存放本地格式文件等)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (存放自动生成数据的目录)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (存放本地配置)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (用户专有文件的目录)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "选项"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "允许用 \\write18 执行一部分在限制列表内的程序"
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "创建所有格式文件"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "安装字体/宏包文档目录树"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "安装字体/宏包源码目录树"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "创建指向系统目录的符号链接"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "关于"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 msgid "Install TeX Live"
 msgstr "安装 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "更改变量的值"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "输入 %s 对应的路径 (使用 ~ 作为 %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "选择要安装的组件"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "全部选择"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "取消全部选择"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "在标准位置创建符号链接"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "程序文件安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "手册文档(*.man)安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "超文本文档(*.info)安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "选择系统架构"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 #, fuzzy
 msgid "Removals of the main platform not possible!"
 msgstr "不可能删除主架构文件！"
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s  来自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s 集合来自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(请首先改变 TEXDIR ！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(默认位置不可写 - 请做相应更改！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1543,6 +1536,9 @@ msgstr ""
 msgid "XeTeX and packages"
 msgstr ""
 
+#~ msgid "Enter path for"
+#~ msgstr "输入路径变量"
+
 #~ msgid ""
 #~ "You don't have permissions to change the installation in any way,\n"
 #~ "specifically, the directory %s is not writable.\n"
diff --git a/Master/tlpkg/translations/zh_TW.po b/Master/tlpkg/translations/zh_TW.po
index b246ef15ec9..571aadd1853 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: 2018-03-15 02:23+0100\n"
+"POT-Creation-Date: 2018-04-30 02:24+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"
@@ -47,13 +47,12 @@ msgstr "安裝 TeX Live"
 
 #: tlpkg/installer/tracked-install.pl:41
 #: tlpkg/installer/install-menu-wizard.pl:383
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-perltk.pl:772
-#: tlpkg/installer/install-menu-perltk.pl:812
-#: tlpkg/installer/install-menu-perltk.pl:865
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:1001
-#: tlpkg/installer/install-menu-perltk.pl:1035
+#: tlpkg/installer/install-menu-perltk.pl:758
+#: tlpkg/installer/install-menu-perltk.pl:798
+#: tlpkg/installer/install-menu-perltk.pl:851
+#: tlpkg/installer/install-menu-perltk.pl:922
+#: tlpkg/installer/install-menu-perltk.pl:987
+#: tlpkg/installer/install-menu-perltk.pl:1021
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -80,51 +79,51 @@ msgstr ""
 msgid "Finish"
 msgstr "完成"
 
-#: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:459
+#: tlpkg/installer/install-menu-wizard.pl:41
+#: tlpkg/installer/install-menu-perltk.pl:445
 msgid "Default paper size"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:42
+#: tlpkg/installer/install-menu-perltk.pl:530
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:557
+#: tlpkg/installer/install-menu-wizard.pl:43
+#: tlpkg/installer/install-menu-perltk.pl:543
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1828
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1832
 msgid "Change file associations"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-wizard.pl:44
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Adjust PATH setting in registry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:45
+#: tlpkg/installer/install-menu-perltk.pl:556
 #, fuzzy
 msgid "Installation for all users"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-wizard.pl:46
+#: tlpkg/installer/install-menu-perltk.pl:569
 #, fuzzy
 msgid "Install TeXworks front end"
 msgstr "安裝字體/巨集包文檔目錄樹"
 
 #: tlpkg/installer/install-menu-wizard.pl:136
-#: tlpkg/installer/install-menu-perltk.pl:222
-#: tlpkg/installer/install-menu-perltk.pl:702
+#: tlpkg/installer/install-menu-perltk.pl:215
+#: tlpkg/installer/install-menu-perltk.pl:688
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s 安裝"
 
 #: tlpkg/installer/install-menu-wizard.pl:151
-#: tlpkg/installer/install-menu-perltk.pl:644
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:630
+#: tlpkg/installer/install-menu-perltk.pl:676
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "退出"
@@ -134,9 +133,9 @@ msgstr "退出"
 #: tlpkg/installer/install-menu-wizard.pl:337
 #: tlpkg/installer/install-menu-wizard.pl:389
 #: tlpkg/installer/install-menu-wizard.pl:396
-#: tlpkg/installer/install-menu-wizard.pl:474
-#: tlpkg/installer/install-menu-wizard.pl:583
-#: tlpkg/installer/install-menu-wizard.pl:629
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-wizard.pl:607
 msgid "< Back"
 msgstr ""
 
@@ -144,8 +143,8 @@ msgstr ""
 #: tlpkg/installer/install-menu-wizard.pl:198
 #: tlpkg/installer/install-menu-wizard.pl:269
 #: tlpkg/installer/install-menu-wizard.pl:338
-#: tlpkg/installer/install-menu-wizard.pl:475
-#: tlpkg/installer/install-menu-wizard.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:562
 msgid "Next >"
 msgstr ""
 
@@ -182,29 +181,29 @@ msgid "Change default repository"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:236
+#: tlpkg/installer/install-menu-perltk.pl:229
 msgid "Command line repository"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:235
-#: tlpkg/installer/install-menu-perltk.pl:242
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:239
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:240
-#: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:241
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1484
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1516
 msgid "Default remote repository"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:246
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:246
 msgid "Select repository"
 msgstr ""
 
@@ -233,7 +232,7 @@ msgid "This will take some time!"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:277
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
@@ -251,24 +250,23 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:424
-#: tlpkg/installer/install-menu-wizard.pl:609
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:587
 msgid "Destination folder:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:426
-#: tlpkg/installer/install-menu-perltk.pl:324
-#: tlpkg/installer/install-menu-perltk.pl:336
-#: tlpkg/installer/install-menu-perltk.pl:350
-#: tlpkg/installer/install-menu-perltk.pl:383
-#: tlpkg/installer/install-menu-perltk.pl:387
-#: tlpkg/installer/install-menu-perltk.pl:403
-#: tlpkg/installer/install-menu-perltk.pl:416
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:441
-#: tlpkg/installer/install-menu-perltk.pl:533
-#: tlpkg/installer/install-menu-perltk.pl:549
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:317
+#: tlpkg/installer/install-menu-perltk.pl:329
+#: tlpkg/installer/install-menu-perltk.pl:343
+#: tlpkg/installer/install-menu-perltk.pl:375
+#: tlpkg/installer/install-menu-perltk.pl:389
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:414
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:519
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:548
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -284,70 +282,28 @@ msgstr ""
 msgid "Change"
 msgstr "改變"
 
-#: tlpkg/installer/install-menu-wizard.pl:448
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:470
-#: tlpkg/installer/install-menu-perltk.pl:1094
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1080
 #, fuzzy
 msgid "disk space required:"
 msgstr "需要的磁碟空間"
 
-#: tlpkg/installer/install-menu-wizard.pl:490
-#: tlpkg/installer/install-menu-perltk.pl:1105
+#: tlpkg/installer/install-menu-wizard.pl:489
+#: tlpkg/installer/install-menu-perltk.pl:1091
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-msgid "Enter path for"
-msgstr "輸入路徑變數"
-
-#: tlpkg/installer/install-menu-wizard.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:287
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:624
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:805
-#: tlpkg/installer/install-menu-perltk.pl:861
-#: tlpkg/installer/install-menu-perltk.pl:919
-#: tlpkg/installer/install-menu-perltk.pl:999
-#: tlpkg/installer/install-menu-perltk.pl:1031
-#: tlpkg/installer/install-menu-perltk.pl:1052
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
-#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
-msgid "Ok"
-msgstr "確定"
-
-#: tlpkg/installer/install-menu-wizard.pl:556
+#: tlpkg/installer/install-menu-wizard.pl:534
 msgid "This screen allows you to configure some options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:601
+#: tlpkg/installer/install-menu-wizard.pl:579
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -356,90 +312,90 @@ msgid ""
 "otherwise press the \"Install\" button."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:70
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1239
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "Yes"
 msgstr "是"
 
-#: tlpkg/installer/install-menu-wizard.pl:617
-#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-wizard.pl:595
+#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:1141
+#: tlpkg/installer/install-menu-perltk.pl:1142
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
 #: tlpkg/installer/install-menu-perltk.pl:1155
-#: tlpkg/installer/install-menu-perltk.pl:1156
-#: tlpkg/installer/install-menu-perltk.pl:1157
-#: tlpkg/installer/install-menu-perltk.pl:1163
-#: tlpkg/installer/install-menu-perltk.pl:1169
-#: tlpkg/installer/install-menu-perltk.pl:1237
-#: tlpkg/installer/install-menu-perltk.pl:1258
-#: tlpkg/installer/install-menu-perltk.pl:1259
-#: tlpkg/installer/install-menu-perltk.pl:1261
+#: tlpkg/installer/install-menu-perltk.pl:1228
+#: tlpkg/installer/install-menu-perltk.pl:1249
+#: tlpkg/installer/install-menu-perltk.pl:1250
+#: tlpkg/installer/install-menu-perltk.pl:1252
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1730
 msgid "No"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-wizard.pl:626
+#: tlpkg/installer/install-menu-wizard.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 #, fuzzy
 msgid "Install"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
-#: tlpkg/installer/install-menu-perltk.pl:1260
+#: tlpkg/installer/install-menu-perltk.pl:48
+#: tlpkg/installer/install-menu-perltk.pl:1251
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 #, fuzzy
 msgid "None"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:49
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:50
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:61
+#: tlpkg/installer/install-menu-perltk.pl:52
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:62
+#: tlpkg/installer/install-menu-perltk.pl:53
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1358
 msgid "letter"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:64
+#: tlpkg/installer/install-menu-perltk.pl:55
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:65
+#: tlpkg/installer/install-menu-perltk.pl:56
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:66
+#: tlpkg/installer/install-menu-perltk.pl:57
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:277
+#: tlpkg/installer/install-menu-perltk.pl:270
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2569
 msgid "Load"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:283
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1268
+#: tlpkg/installer/install-menu-perltk.pl:276
+#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-perltk.pl:1036
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1660
@@ -451,11 +407,48 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:279
 msgid "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:293
+#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:291
+#: tlpkg/installer/install-menu-perltk.pl:610
+#: tlpkg/installer/install-menu-perltk.pl:752
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:847
+#: tlpkg/installer/install-menu-perltk.pl:905
+#: tlpkg/installer/install-menu-perltk.pl:985
+#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:235
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:629
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:633
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:635
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:653
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:832
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1064
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1436
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1467
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1526
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1651
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1661
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1781
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1808
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1843
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1892
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:1953
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2270
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2332
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2358
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2466
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2504
+#: texmf-dist/scripts/texlive/tlmgrgui.pl:2669
+msgid "Ok"
+msgstr "確定"
+
+#: tlpkg/installer/install-menu-perltk.pl:286
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -465,48 +458,48 @@ msgid ""
 "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-perltk.pl:306
 msgid "Basic Information"
 msgstr "基本資訊"
 
-#: tlpkg/installer/install-menu-perltk.pl:319
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:996
 msgid "Binary system(s)"
 msgstr "二進位系統"
 
-#: tlpkg/installer/install-menu-perltk.pl:331
+#: tlpkg/installer/install-menu-perltk.pl:324
+#: tlpkg/installer/install-menu-perltk.pl:809
 #: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:837
 msgid "Selected scheme"
 msgstr "選擇安裝方案"
 
-#: tlpkg/installer/install-menu-perltk.pl:342
+#: tlpkg/installer/install-menu-perltk.pl:335
 msgid "Further Customization"
 msgstr "進一步定制"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
-#: tlpkg/installer/install-menu-perltk.pl:873
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:859
 msgid "Installation collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:354
 msgid "Directory setup"
 msgstr "目錄設置"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:363
+#: tlpkg/installer/install-menu-perltk.pl:450
 #: tlpkg/installer/install-menu-perltk.pl:464
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:492
-#: tlpkg/installer/install-menu-perltk.pl:504
-#: tlpkg/installer/install-menu-perltk.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:536
+#: tlpkg/installer/install-menu-perltk.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:522
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: tlpkg/installer/install-menu-perltk.pl:575
-#: tlpkg/installer/install-menu-perltk.pl:589
-#: tlpkg/installer/install-menu-perltk.pl:605
+#: tlpkg/installer/install-menu-perltk.pl:591
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -515,163 +508,163 @@ msgstr ""
 msgid "Toggle"
 msgstr "切換"
 
-#: tlpkg/installer/install-menu-perltk.pl:376
+#: tlpkg/installer/install-menu-perltk.pl:369
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (主 TeX 目錄)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:383
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (存放本地格式檔等)"
 
-#: tlpkg/installer/install-menu-perltk.pl:410
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (存放本地配置)"
 
-#: tlpkg/installer/install-menu-perltk.pl:423
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (存放本地配置)"
 
-#: tlpkg/installer/install-menu-perltk.pl:435
+#: tlpkg/installer/install-menu-perltk.pl:421
 #, fuzzy
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFLOCAL (存放本地格式檔等)"
 
-#: tlpkg/installer/install-menu-perltk.pl:454
+#: tlpkg/installer/install-menu-perltk.pl:440
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "選項"
 
-#: tlpkg/installer/install-menu-perltk.pl:472
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:487
+#: tlpkg/installer/install-menu-perltk.pl:473
 msgid "Create all format files"
 msgstr "創建所有格式檔"
 
-#: tlpkg/installer/install-menu-perltk.pl:499
+#: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Install font/macro doc tree"
 msgstr "安裝字體/巨集包文檔目錄樹"
 
-#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro source tree"
 msgstr "安裝字體/巨集包源碼目錄樹"
 
-#: tlpkg/installer/install-menu-perltk.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:976
+#: tlpkg/installer/install-menu-perltk.pl:512
+#: tlpkg/installer/install-menu-perltk.pl:962
 msgid "Create symlinks in system directories"
 msgstr "創建指向系統目錄的符號鏈結"
 
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-perltk.pl:585
 msgid "After installation, get package updates from CTAN"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:607
+#: tlpkg/installer/install-menu-perltk.pl:609
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:626
 #, fuzzy
 msgid "Install TeX Live"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:676
 msgid "Continue"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:692
+#: tlpkg/installer/install-menu-perltk.pl:678
 msgid ""
 "In case of trouble, try disabling your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:695
+#: tlpkg/installer/install-menu-perltk.pl:681
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:684
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:789
+#: tlpkg/installer/install-menu-perltk.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:775
 msgid "Change variable value"
 msgstr "更改變數的值"
 
-#: tlpkg/installer/install-menu-perltk.pl:749
-#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:735
+#: tlpkg/installer/install-menu-perltk.pl:785
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "輸入路徑變數 %s (使用 ~ 作為 %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:846
+#: tlpkg/installer/install-menu-perltk.pl:832
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:883
+#: tlpkg/installer/install-menu-perltk.pl:869
 msgid "Select the collections to be installed"
 msgstr "選擇要安裝的組件"
 
-#: tlpkg/installer/install-menu-perltk.pl:911
+#: tlpkg/installer/install-menu-perltk.pl:897
 msgid "Select All"
 msgstr "全部選擇"
 
-#: tlpkg/installer/install-menu-perltk.pl:915
+#: tlpkg/installer/install-menu-perltk.pl:901
 msgid "Deselect All"
 msgstr "取消全部選擇"
 
-#: tlpkg/installer/install-menu-perltk.pl:981
+#: tlpkg/installer/install-menu-perltk.pl:967
 msgid "create symlinks in standard directories"
 msgstr "在標準位置創建符號鏈結"
 
-#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:970
 msgid "binaries to"
 msgstr "程式檔安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:986
+#: tlpkg/installer/install-menu-perltk.pl:972
 msgid "manpages to"
 msgstr "手冊文檔(*.man)安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:988
+#: tlpkg/installer/install-menu-perltk.pl:974
 msgid "info to"
 msgstr "超文本文檔(*.info)安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:1019
+#: tlpkg/installer/install-menu-perltk.pl:1005
 msgid "Select arch-os"
 msgstr "選擇系統架構"
 
-#: tlpkg/installer/install-menu-perltk.pl:1051
+#: tlpkg/installer/install-menu-perltk.pl:1037
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1085
+#: tlpkg/installer/install-menu-perltk.pl:1071
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s 來自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1092
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s 集合來自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1120
-#: tlpkg/installer/install-menu-perltk.pl:1138
+#: tlpkg/installer/install-menu-perltk.pl:1106
+#: tlpkg/installer/install-menu-perltk.pl:1124
 msgid "(please change TEXDIR first!)"
 msgstr "(請首先改變 TEXDIR ！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1125
-#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1111
+#: tlpkg/installer/install-menu-perltk.pl:1129
 msgid "(default not writable - please change!)"
 msgstr "(默認位置不可寫 - 請做相應更改！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1270
+#: tlpkg/installer/install-menu-perltk.pl:1261
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1566,6 +1559,9 @@ msgstr ""
 msgid "XeTeX and packages"
 msgstr ""
 
+#~ msgid "Enter path for"
+#~ msgstr "輸入路徑變數"
+
 #~ msgid "Standard collections"
 #~ msgstr "標準安裝"