autoupdate via tl-update-messages

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

18 files changed, 4495 insertions, 4899 deletions

diff --git a/Master/tlpkg/translations/cs.po b/Master/tlpkg/translations/cs.po
index e0dafae1655..ef13505149e 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+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"
@@ -18,19 +18,17 @@ msgstr ""
 "X-Generator: Poedit 1.8.7.1\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Výchozí formát papíru"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Přidat menu zkratek"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -38,55 +36,55 @@ 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:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 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:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 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:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Nainstaluj pomocníka TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalace TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Ukončit"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Předcházející"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Další >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -99,12 +97,12 @@ msgstr ""
 "\n"
 "Tento průvodce vás provede instalací."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
-msgstr "Během instalace je doporučeno vypnutí antivirového software."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -112,79 +110,77 @@ msgstr ""
 "Informace o pokročilé, konfigurovatelné instalaci najdete\n"
 "na webových stránkách nebo v instalační příručce."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Nebo použijte install-tl-advanced.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Nebo zadejte  --gui expert  v příkazu install-tl."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Změnit výchozí zdroj"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Zdroj pro příkazový řádek"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "MÍSTNÍ ZDROJE"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "SÍŤOVÉ ZDROJE"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Výchozí síťový zdroj balíků"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Vybrat zdroj"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Zrcadlo:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Kontinent"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Státy"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Zrcadla"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "Prosím, počkejte, až se načte databáze zdrojů."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Bude to nějakou dobu trvat!"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -203,17 +199,17 @@ msgstr "Bude to nějakou dobu trvat!"
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Nelze načíst vzdálenou databázi TeX Live:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Prosím, zvolte jiné zrcadlo."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -226,23 +222,24 @@ msgstr ""
 "     místní: %s\n"
 "      zdroj: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Cílová složka:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -258,7 +255,7 @@ msgstr "Cílová složka:"
 msgid "Change"
 msgstr "Změnit"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -266,32 +263,31 @@ 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:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "vyžadované místo na disku"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 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:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Zadat cestu pro"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -319,11 +315,11 @@ msgstr "Zadat cestu pro"
 msgid "Ok"
 msgstr "OK"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 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:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -336,146 +332,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:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Ano"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Ne"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Nainstaluj"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Viz %s/index.html pro odkazy na dokumentaci. Stránky TeX Live\n"
-"(http://tug.org/texlive/) obsahují aktualizace a opravy.\n"
-"TeX Live je společným projektem uživatelských sdružení TeXu po celém světě;\n"
-"zvažte laskavě jeho podporu přihlášením se do sdružení, které vám nejlépe "
-"vyhovuje.\n"
-"Seznam sdružení je dostupný na http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Přidejte %s/texmf-dist/doc/man do MANPATH.\n"
-"Přidejte %s/texmf-dist/doc/info do INFOPATH.\n"
-"A především, přidejte %s/bin/%s\n"
-"do proměnnér PATH pro současnou i budoucí sessions."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Během instalace byla nahlášena varování.\n"
-"Zde je seznam zpráv:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Vítejte v TeX Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Dokončit"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Žádné"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Jen nové"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Všechny"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Nahrát"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -487,11 +425,11 @@ msgstr "Nahrát"
 msgid "Warning"
 msgstr "Varování"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Prosím vyberte jiné zrcadlo."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -505,31 +443,31 @@ msgstr ""
 "  zdroj: %s\n"
 "Prosím, zvolte jiné zrcadlo."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Základní informace"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Binární systém(y)"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Vybrané schéma"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Další přizpůsobení"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Kolekce k instalaci"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Nastavení adresářové struktury"
 
@@ -537,17 +475,16 @@ msgstr "Nastavení adresářové struktury"
 msgid "Portable setup"
 msgstr "Portabilní nastavení"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -556,68 +493,77 @@ msgstr "Portabilní nastavení"
 msgid "Toggle"
 msgstr "Přepnout"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (hlavní adresář TeXu)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 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:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (adresář pro generované soubory)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (adresář pro lokální konfiguraci)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (adresář pro uživatelské soubory)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Volby"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 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:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Vytvořit všechny formáty"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Instalovat dokumentaci fontů/maker"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Instalovat zdrojové soubory fontů/maker"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Vytvořit symbolické linky v systémových adresářích"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 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:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: 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:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Nainstaluj TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Pokračuj"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -625,7 +571,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:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -633,88 +579,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:589
-msgid "Continue"
-msgstr "Pokračuj"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Instalace"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Změnit hodnotu proměnné"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, 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:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "vlastní výběr kolekcí"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Vybrat kolekce k nainstalování"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Zrušit výběr všech položek"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "vytvořit symbolické linky ve standardních adresářích"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "binární soubory do"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "manuálové stránky do"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "info soubory do"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Vybrat architekturu a OS"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: 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:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcí z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(prosím, změňte nejdříve TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 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:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1636,6 +1573,52 @@ msgstr "Podpůrné programy výhradně pro Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX a balíky"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr "Během instalace je doporučeno vypnutí antivirového software."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Viz %s/index.html pro odkazy na dokumentaci. Stránky TeX Live\n"
+#~ "(http://tug.org/texlive/) obsahují aktualizace a opravy.\n"
+#~ "TeX Live je společným projektem uživatelských sdružení TeXu po celém "
+#~ "světě;\n"
+#~ "zvažte laskavě jeho podporu přihlášením se do sdružení, které vám nejlépe "
+#~ "vyhovuje.\n"
+#~ "Seznam sdružení je dostupný na http://tug.org/usergroups.html."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Přidejte %s/texmf-dist/doc/man do MANPATH.\n"
+#~ "Přidejte %s/texmf-dist/doc/info do INFOPATH.\n"
+#~ "A především, přidejte %s/bin/%s\n"
+#~ "do proměnnér PATH pro současnou i budoucí sessions."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Během instalace byla nahlášena varování.\n"
+#~ "Zde je seznam zpráv:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Vítejte v TeX Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Dokončit"
+
+#~ msgid "Installation process"
+#~ msgstr "Instalace"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Matematické balíky"
 
diff --git a/Master/tlpkg/translations/de.po b/Master/tlpkg/translations/de.po
index 8767ddaabb3..e76c5e36ef8 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+0200\n"
 "PO-Revision-Date: 2016-05-01 09:20+0100\n"
 "Last-Translator: Uwe Ziegenhagen <ziegenhagen@gmail.com>\n"
 "Language-Team: TL German Translation Team <tex-live@tug.org>\n"
@@ -14,19 +14,17 @@ msgstr ""
 "X-Generator: Poedit 1.6.4\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Standard-Papierformat"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Füge Menüeinträge hinzu"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -34,55 +32,55 @@ msgid "Change file associations"
 msgstr "Anpassen der Datei-Verknüpfungen"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 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:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr "Installation für alle Benutzer"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Installiere TeXworks als Frontend"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s Installation"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Beenden"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Zurück"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Weiter >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -95,12 +93,12 @@ msgstr ""
 "\n"
 "Dieses Setup-Programm begleitet Sie durch die Installation."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
-msgstr "Wir empfehlen, Virenscanner während der Installation zu deaktivieren."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -108,80 +106,78 @@ msgstr ""
 "Für fortgeschrittene Installationsoptionen konsultieren Sie\n"
 "bitte die Web-Seiten von TeX Live oder die Anleitung."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Oder nutzen sie die install-tl-advanced.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr ""
 "Oder geben Sie die Option '--gui expert' beim Aufruf von install-tl an."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Ändern der voreingestellten Installationsquelle"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Kommandozeilen-Repository"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "Lokale Quellen"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "Netzwerkquellen"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Voreingestellte Netzwerkinstallationsquelle"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Auswahl der  Installationsquelle"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Spiegelserver:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Kontinent"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Länder"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Spiegelserver"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "Bitte warten bis die Installationsdatenbank geladen ist."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Dies kann etwas Zeit beanspruchen!"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -200,17 +196,17 @@ msgstr "Dies kann etwas Zeit beanspruchen!"
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Konnte die Netzwerk-Datenbank von TeX Live nicht laden"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Bitte zurückgehen und einen anderen Spiegelserver auswählen."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -223,23 +219,24 @@ msgstr ""
 "  lokal: %s\n"
 "  Installationsquelle:%s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Zielverzeichnis:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -255,7 +252,7 @@ msgstr "Zielverzeichnis:"
 msgid "Change"
 msgstr "Ändern"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -263,33 +260,32 @@ msgstr ""
 "Das Installationsverzeichnis enthält die TeX Live Installation.\n"
 "Wie empfehlen, das Jahr als letzten Ordner beizubehalten."
 
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "Benötigter Festplattenplatz:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 "(Standardverzeichnis nicht zugänglich oder beschreibbar - bitte ändern)"
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: 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:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -317,11 +313,11 @@ msgstr "Bitte geben Sie den Pfad ein für"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "Weitere Konfigurations-Optionen:"
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -334,150 +330,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:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Ja"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Nein"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Installation"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Für einen Überblick der verfügbaren Dokumentation lesen Sie bitte %s/index."
-"html.\n"
-"Die Webseite des TeX Live Projektes (http://tug.org/texlive/)\n"
-"informiert über Updates und Korrekturen.\n"
-"\n"
-"TeX Live ist ein gemeinsames Projekt verschiedener TeX Benutzer Gruppen aus "
-"aller Welt;\n"
-"durch einen Beitritt in eine dieser Gruppen können Sie TeX Live aktiv "
-"unterstützen.Eine Liste der Gruppen können Sie im Internet auf http://tug."
-"org/usergroups.html finden."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Füge %s/texmf-dist/doc/man zu  MANPATH hinzu.\n"
-"Füge %s/texmf-dist/doc/info zu INFOPATH hinzu.\n"
-"Am wichtigsten, füge  %s/bin/%s\n"
-"zur PATH Variable hinzu."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Es gab Warnungen während der Installation.\n"
-" Hier die Liste der Warnhinweise"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Willkommen bei TeX Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Ende"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Gar nicht"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Nur neue"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Alle"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "Letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Laden"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -489,11 +423,11 @@ msgstr "Laden"
 msgid "Warning"
 msgstr "Warnung"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Bitte einen anderen Spiegelserver wählen!"
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -508,31 +442,31 @@ msgstr ""
 "  Installationsquelle: %s\n"
 "Bitte anderen Spiegelserver auswählen."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Grundlegende Informationen"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Binärsysteme"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Ausgewählter Installations-Umfang"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Weitere Einstellungen"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Auswahl der Komponenten"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Ordner-Einrichtung"
 
@@ -540,17 +474,16 @@ msgstr "Ordner-Einrichtung"
 msgid "Portable setup"
 msgstr "Portable Installation"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -559,68 +492,77 @@ msgstr "Portable Installation"
 msgid "Toggle"
 msgstr "Ändern"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (Hauptverzeichnis für TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (lokale Makro-Pakete, etc)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (automatisch erstellte Dateien)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (lokale Konfiguration)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (Eigene Makro-Pakete)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Optionen"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 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:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Alle Formatdateien erstellen"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Installation der Font/Macro-Dokumentation"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Installation der Font/Macro-Quellen"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Symbolische Links in Systemverzeichnissen"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr "Hole nach der Installation Paket-Updates von CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: 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:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "TeX Live installieren"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Weiter"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -628,7 +570,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:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -637,88 +579,79 @@ msgstr ""
 "ausführen\"\n"
 "wenn Sie für alle Benutzer installieren möchten."
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "Weiter"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Installation"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Ändern der Werte von Variablen"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, 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:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "benutzerdefinierte Auswahl der Collections"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Auswahl der zu installierenden Paketgruppen"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Alle anwählen"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Alle abwählen"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "Erstellen von symbolischen Links in Standard-Ordnern"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "Programme nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "Hilfeseiten (*.man) nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "Infoseiten (*.info) nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Auswahl der Architekturen"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: 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:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s von %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s Paketgruppen von %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(Bitte zuerst TEXDIR ändern!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(Vorgabe ohne Schreibberechtigung - bitte ändern!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1638,6 +1571,56 @@ msgstr "Zusatzprogramme (nur-Windows)"
 msgid "XeTeX and packages"
 msgstr "XeTeX und Pakete"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr ""
+#~ "Wir empfehlen, Virenscanner während der Installation zu deaktivieren."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Für einen Überblick der verfügbaren Dokumentation lesen Sie bitte %s/"
+#~ "index.html.\n"
+#~ "Die Webseite des TeX Live Projektes (http://tug.org/texlive/)\n"
+#~ "informiert über Updates und Korrekturen.\n"
+#~ "\n"
+#~ "TeX Live ist ein gemeinsames Projekt verschiedener TeX Benutzer Gruppen "
+#~ "aus aller Welt;\n"
+#~ "durch einen Beitritt in eine dieser Gruppen können Sie TeX Live aktiv "
+#~ "unterstützen.Eine Liste der Gruppen können Sie im Internet auf http://tug."
+#~ "org/usergroups.html finden."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Füge %s/texmf-dist/doc/man zu  MANPATH hinzu.\n"
+#~ "Füge %s/texmf-dist/doc/info zu INFOPATH hinzu.\n"
+#~ "Am wichtigsten, füge  %s/bin/%s\n"
+#~ "zur PATH Variable hinzu."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Es gab Warnungen während der Installation.\n"
+#~ " Hier die Liste der Warnhinweise"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Willkommen bei TeX Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Ende"
+
+#~ msgid "Installation process"
+#~ msgstr "Installation"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Mathematikpakete"
 
diff --git a/Master/tlpkg/translations/es.po b/Master/tlpkg/translations/es.po
index 0608e9c6735..b6fe5facc1e 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+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"
@@ -15,19 +15,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -35,55 +33,55 @@ msgid "Change file associations"
 msgstr "Cambiar asociaciones de archivos"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 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:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 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:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Instalar el editor gráfico TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalación de TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Salir"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Atrás"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Siguiente >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -92,90 +90,88 @@ msgid ""
 "This wizard will guide you through the installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Repositorio de paquetes por defecto"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -194,17 +190,17 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -213,23 +209,24 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Ruta de instalación:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -245,7 +242,7 @@ msgstr "Ruta de instalación:"
 msgid "Change"
 msgstr "Cambiar"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -254,32 +251,31 @@ 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:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Introduzca la ruta para"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -307,11 +303,11 @@ msgstr "Introduzca la ruta para"
 msgid "Ok"
 msgstr "Aceptar"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "Esta pantalla le permite configurar ciertas opciones"
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -324,140 +320,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:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Sí"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "No"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Instalar"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Ver %s/index.html para enlaces a la documentación.\n"
-"La página web de  TeX Live (http://tug.org/texlive/) contiene las "
-"actualizaciones y correctiones. TeX Live es un  proyecto conjunto de los "
-"usuarios de TeX a lo largo y ancho del mundo; por favor, considera dar su "
-"apoyo uniéndose al grupo que más le convenga. La lista de grupos está "
-"disponible en la página web http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "¡Bienvenido a Tex Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Terminar"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Ninguna"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Sólo nuevas"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Todas"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "carta"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Cargar"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -469,11 +413,11 @@ msgstr "Cargar"
 msgid "Warning"
 msgstr "Advertencia"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -483,31 +427,31 @@ msgid ""
 "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Información básica"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Arquitectura seleccionada"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Esquema seleccionado"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Personalización avanzada"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Configuración de directorios"
 
@@ -515,17 +459,16 @@ msgstr "Configuración de directorios"
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -534,161 +477,161 @@ msgstr ""
 msgid "Toggle"
 msgstr "Cambiar (sí/no)"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (directorio TeX principal)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (directorio de ficheros locales)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (directorio de datos generados automáticamente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (directorio de configuración local)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (directorio de ficheros personales del usuario)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Opciones"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Crear todos los archivos de formato"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Instalar la documentación de tipos de letra y macros"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Instalar las fuentes de tipos de letra y macros"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Crear enlaces simbólicos en los  directorios de sistema"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: 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:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Instalar Tex Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 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:589
-msgid "Continue"
-msgstr ""
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Proceso de instalación"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Cambiar el valor de la variable"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, 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:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Seleccione las colecciones que se instalarán"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Deseleccionar todo"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "crear enlaces simbólicos en los directorios estándar"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "ficheros ejecutables en"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "páginas de manual en"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "información en"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Seleccionar arquitectura-sistema operativo"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s de %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(por favor, ¡cambie el TEXDIR primero!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(no se permite la escritura, ¡cambie el directorio por favor!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1590,6 +1533,30 @@ msgid "XeTeX and packages"
 msgstr ""
 
 #~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Ver %s/index.html para enlaces a la documentación.\n"
+#~ "La página web de  TeX Live (http://tug.org/texlive/) contiene las "
+#~ "actualizaciones y correctiones. TeX Live es un  proyecto conjunto de los "
+#~ "usuarios de TeX a lo largo y ancho del mundo; por favor, considera dar su "
+#~ "apoyo uniéndose al grupo que más le convenga. La lista de grupos está "
+#~ "disponible en la página web http://tug.org/usergroups.html."
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "¡Bienvenido a Tex Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Terminar"
+
+#~ msgid "Installation process"
+#~ msgstr "Proceso de instalación"
+
+#~ msgid ""
 #~ "You don't have permissions to change the installation in any way,\n"
 #~ "specifically, the directory %s is not writable.\n"
 #~ "Please run this program as administrator, or contact your local admin.\n"
diff --git a/Master/tlpkg/translations/fr.po b/Master/tlpkg/translations/fr.po
index cf0ba1f4051..cf32d1ae8c5 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+0200\n"
 "PO-Revision-Date: 2016-05-08 16:32+0200\n"
 "Last-Translator: Denis Bitouzé <dbitouze@wanadoo.fr>\n"
 "Language-Team: French <>\n"
@@ -20,19 +20,17 @@ msgstr ""
 "X-Generator: Lokalize 1.5\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Taille de papier par défaut"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Ajouter des raccourcis au menu"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -40,55 +38,55 @@ msgid "Change file associations"
 msgstr "Modifier les associations de fichiers"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 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:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr "Installer pour tous les utilisateurs"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Installer l'éditeur intégré TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Installation de la TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Quitter"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Précédent"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Suivant >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -101,13 +99,12 @@ msgstr ""
 "\n"
 "Cet assistant vous guidera durant le processus d'installation."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
 msgstr ""
-"Il est recommandé de désactiver votre antivirus pendant l'installation."
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -115,81 +112,79 @@ msgstr ""
 "Pour une installation avancée et personnalisable, veuillez\n"
 "consulter les pages web ou le guide d'installation."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Ou utilisez install-tl-advance.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Ou utilisez l'option  --gui expert  de install-tl."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Changer de dépôt par défaut"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Dépôt indiqué sur la ligne de commande"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "Dépôts de paquets locaux"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "Dépôts de paquets du réseau"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Dépôt de paquets distant par défaut"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Choisir le dépôt de paquets"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Miroir :"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Continent"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Pays"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Miroirs"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 "Veuillez patienter pendant le chargement de la base de données des dépôts de "
 "paquets."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Ceci peut prendre du temps."
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -208,17 +203,17 @@ msgstr "Ceci peut prendre du temps."
 msgid "Cancel"
 msgstr "Annuler"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Échec du chargement de la base de données TeX Live distante :"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Veuillez revenir en arrière et choisir un autre miroir."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -231,23 +226,24 @@ msgstr ""
 "installée : %s\n"
 "    dépôt : %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Répertoire de destination :"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -263,7 +259,7 @@ msgstr "Répertoire de destination :"
 msgid "Change"
 msgstr "Modifier"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -271,32 +267,31 @@ 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:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "Espace disque nécessaire :"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 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:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Entrer le chemin"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -324,11 +319,11 @@ msgstr "Entrer le chemin"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 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:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -341,147 +336,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:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Oui"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Non"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Installer"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Voir %s/index.html pour des liens vers la documentation.\n"
-"Le site web de TeX Live (http://tug.org/texlive/) propose toutes les mises à "
-"jour et les correctifs. TeX Live est un projet commun des groupes "
-"d'utilisateurs de TeX à travers le monde ; pensez à lui apporter votre "
-"soutien en rejoignant le groupe qui vous convient le mieux. La liste des "
-"groupes est disponible sur le web à l'adresse http://tug.org/usergroups."
-"html ; la page du groupe francophone est http://www.gutenberg.eu.org/."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Veuillez ajouter %s/texmf/doc/man à votre MANPATH\n"
-"et %s/texmf/doc/info à votre INFOPATH,\n"
-"mais surtout, ajoutez %s/bin/%s\n"
-"à votre PATH, pour cette session et les suivantes."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Des avertissements ont été émis durant l'installation.\n"
-"Voici la liste des messages émis :"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Bienvenue sous TeX Live !"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Terminer"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Aucun"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Seulement les nouveaux"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Tous"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Charger"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -493,11 +429,11 @@ msgstr "Charger"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Veuillez choisir un autre miroir."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -512,31 +448,31 @@ msgstr ""
 "    dépôt : %s\n"
 "Veuillez choisir un autre miroir."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Informations générales"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Plate(s)-forme(s) des binaires"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Schéma sélectionné"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Personnalisation avancée"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Installation des collections"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Choix des répertoires"
 
@@ -544,17 +480,16 @@ msgstr "Choix des répertoires"
 msgid "Portable setup"
 msgstr "Options de portabilité"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -563,68 +498,77 @@ msgstr "Options de portabilité"
 msgid "Toggle"
 msgstr "Basculer"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (répertoire TeX principal)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (répertoire des fichiers locaux, etc.)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (répertoire des fichiers générés automatiquement)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (répertoire de la configuration locale)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (répertoire des fichiers personnels)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Options"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 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:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Générer tous les formats"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Installer la documentation des macros et polices"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Installer les sources des macros et polices"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Créer les liens symboliques dans les répertoires-système"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 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:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "À propos"
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Installer TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Continuer"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -632,7 +576,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:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -641,88 +585,79 @@ msgstr ""
 "« Exécuter en tant qu'administrateur » si vous souhaitez\n"
 "installer pour tous les utilisateurs."
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "Continuer"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Processus d'installation"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Changer la valeur de la variable"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Entrer le chemin %s (utiliser ~ pour %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "sélection personnalisée de collections"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Choisir les collections à installer"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Tout désélectionner"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "Créer des liens symboliques dans les répertoires standards"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "Emplacement des binaires"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "Emplacement des pages de man"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "Emplacement des pages info"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Choisir la plate-forme"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: 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:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s parmi %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collections parmi %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(changer d'abord TEXDIR !)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(écriture impossible - changer d'emplacement !)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1648,6 +1583,53 @@ msgstr "Programmes pour le support de Windows seulement"
 msgid "XeTeX and packages"
 msgstr "XeTeX et paquets associés"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr ""
+#~ "Il est recommandé de désactiver votre antivirus pendant l'installation."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Voir %s/index.html pour des liens vers la documentation.\n"
+#~ "Le site web de TeX Live (http://tug.org/texlive/) propose toutes les "
+#~ "mises à jour et les correctifs. TeX Live est un projet commun des groupes "
+#~ "d'utilisateurs de TeX à travers le monde ; pensez à lui apporter votre "
+#~ "soutien en rejoignant le groupe qui vous convient le mieux. La liste des "
+#~ "groupes est disponible sur le web à l'adresse http://tug.org/usergroups."
+#~ "html ; la page du groupe francophone est http://www.gutenberg.eu.org/."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Veuillez ajouter %s/texmf/doc/man à votre MANPATH\n"
+#~ "et %s/texmf/doc/info à votre INFOPATH,\n"
+#~ "mais surtout, ajoutez %s/bin/%s\n"
+#~ "à votre PATH, pour cette session et les suivantes."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Des avertissements ont été émis durant l'installation.\n"
+#~ "Voici la liste des messages émis :"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Bienvenue sous TeX Live !"
+
+#~ msgid "Finish"
+#~ msgstr "Terminer"
+
+#~ msgid "Installation process"
+#~ msgstr "Processus d'installation"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Paquets pour les mathématiques"
 
diff --git a/Master/tlpkg/translations/it.po b/Master/tlpkg/translations/it.po
index 132321406c5..4253bbc1f05 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+0200\n"
 "PO-Revision-Date: 2013-05-27 10:24+0100\n"
 "Last-Translator: Marco Pallane <marco.pallante@gmail.com>\n"
 "Language-Team: <>\n"
@@ -13,19 +13,17 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Formato pagina predefinito"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Aggiungi le scorciatoie da menu"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -33,55 +31,55 @@ msgid "Change file associations"
 msgstr "Cambia le associazioni dei file"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 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:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr "Installazione per tutti gli utenti"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Installa il programma TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Installazione di TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Esci"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Indietro"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Avanti >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -94,13 +92,12 @@ msgstr ""
 "\n"
 "Questo programma vi guiderà durante il processo di installazione"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
 msgstr ""
-"Ti suggeriamo di disabilitare il programma antivirus durante l'installazione."
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -108,79 +105,77 @@ msgstr ""
 "Per un'installazione avanzata e personalizzabile, consulta\n"
 "le pagine web o la guida all'installazione."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Oppure usa install-tl-advanced.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Oppure esegui install-tl con l'opzione  --gui expert."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Modifica l'archvio predefinito"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Archivio a riga di comando"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "ARCHIVI LOCALI"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "ARCHIVI DI RETE"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Archivio di rete predefinito"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Scegli l'archivio"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Mirror:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Continente"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Paesi"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Mirror"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "Attendi che venga caricato del database dell'archivio."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Questa operazione può durare a lungo!"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -199,17 +194,17 @@ msgstr "Questa operazione può durare a lungo!"
 msgid "Cancel"
 msgstr "Annulla"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Impossibile caricare il database remoto di TeX Live:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Torna indietro e scegli un mirror differente."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -222,23 +217,24 @@ msgstr ""
 "  locale: %s\n"
 "archivio: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Percorso di destinazione:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -254,7 +250,7 @@ msgstr "Percorso di destinazione:"
 msgid "Change"
 msgstr "Cambia"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -263,32 +259,31 @@ msgstr ""
 "Raccomandiamo di lasciare l'anno di questa edizione di TeX Live\n"
 "come ultima componente del percorso."
 
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "spazio necessario sul disco:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(non consentito o senza permessi di scrittura - da cambiare!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Inserisci il percorso per"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -316,11 +311,11 @@ msgstr "Inserisci il percorso per"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "Da questa schermata è possibile configurare alcune opzioni"
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -333,147 +328,88 @@ msgstr ""
 "Se desiderate modificare qualcosa prima di procedere, tornate indietro,\n"
 "altrimenti premete sul pulsante \"Installa\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Sì"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "No"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Installa"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Consulta la pagina %s/index.html nella directory di installazione per i "
-"riferimenti alla documentazione.\n"
-"Visita il sito di TeX Live (http://tug.org/texlive/) per aggiornamenti e "
-"correzioni. TeX Live è un progetto comune dei gruppi di utenti TeX sparsi "
-"per il mondo; per sostenere il progetto, puoi unirti al gruppo più vicino. "
-"La lista dei gruppi è disponibile sul web alla pagina http://tug.org/"
-"usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Aggiungi %s/texmf-dist/doc/man alla variabile MANPATH.\n"
-"Aggiungi %s/texmf-dist/doc/info alla variabile INFOPATH.\n"
-"Più importante di tutti, aggiungi %s/bin/%s\n"
-" alla tua variabilePATH per la sessione attuale e quelle future."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Ci sono stati degli avvisi durante il processo d'installazione.\n"
-"Ecco la lista dei messaggi di avviso:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Benvenuti a TeX Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Fine"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Nessuno"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Solo nuovi"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Tutti"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "lettera"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Carica"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -485,11 +421,11 @@ msgstr "Carica"
 msgid "Warning"
 msgstr "Attenzione"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Scegli un mirror differente."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -504,31 +440,31 @@ msgstr ""
 "  archivio: %s\n"
 "Scegli un mirror differente."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Informazioni di base"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Architetture selezionate"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Schemi selezionati"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Personalizzazioni aggiuntive"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Installazione collezioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Impostazione delle directory"
 
@@ -536,17 +472,16 @@ msgstr "Impostazione delle directory"
 msgid "Portable setup"
 msgstr "Allestimento portatile"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -555,69 +490,78 @@ msgstr "Allestimento portatile"
 msgid "Toggle"
 msgstr "Inverti"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (directory principale di TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 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:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (directory per i dati generati automaticamente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (directory della configurazione per tutti gli utenti)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (directory dei file specifici per ciascun utente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Opzioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 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:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Crea tutti i file di formato"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Installa la documentazione per font e macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Installa i sorgenti per font e macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Crea i collegamenti nelle directory di sistema"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 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:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Informazioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Installa TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Continua"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -625,7 +569,7 @@ msgstr ""
 "Il programma di installazione non possiede i permessi di amministrazione;\n"
 "è possibile eseguire l'installazione solo per l'utente attuale."
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -634,88 +578,79 @@ msgstr ""
 "come amministratore\"\n"
 " per installare per tutti gli utenti"
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "Continua"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Installazione"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Cambia il valore della variabile"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, 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:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "selezione personalizzata delle collezioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Seleziona le collezioni di pacchetti da installare"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Seleziona Tutto"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Deseleziona Tutto"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "crea i collegamenti simbolici nelle directory standard"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "eseguibili in"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "pagine di manuale in"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "pagine info in"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Seleziona le combinazioni di architetture e sistemi operativi"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: 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:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s su %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collezioni su %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(è necessario cambiare TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(non si hanno i permessi di scrittura - cambiare il percorso!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1620,6 +1555,54 @@ msgstr "Programmi di supporto solo per Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX e pacchetti"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr ""
+#~ "Ti suggeriamo di disabilitare il programma antivirus durante "
+#~ "l'installazione."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Consulta la pagina %s/index.html nella directory di installazione per i "
+#~ "riferimenti alla documentazione.\n"
+#~ "Visita il sito di TeX Live (http://tug.org/texlive/) per aggiornamenti e "
+#~ "correzioni. TeX Live è un progetto comune dei gruppi di utenti TeX sparsi "
+#~ "per il mondo; per sostenere il progetto, puoi unirti al gruppo più "
+#~ "vicino. La lista dei gruppi è disponibile sul web alla pagina http://tug."
+#~ "org/usergroups.html."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Aggiungi %s/texmf-dist/doc/man alla variabile MANPATH.\n"
+#~ "Aggiungi %s/texmf-dist/doc/info alla variabile INFOPATH.\n"
+#~ "Più importante di tutti, aggiungi %s/bin/%s\n"
+#~ " alla tua variabilePATH per la sessione attuale e quelle future."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Ci sono stati degli avvisi durante il processo d'installazione.\n"
+#~ "Ecco la lista dei messaggi di avviso:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Benvenuti a TeX Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Fine"
+
+#~ msgid "Installation process"
+#~ msgstr "Installazione"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Pacchetti per la matematica"
 
diff --git a/Master/tlpkg/translations/ja.po b/Master/tlpkg/translations/ja.po
index 057d2360a3f..c7959ae4057 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+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"
@@ -18,19 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "既定用紙寸法"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "メニューショートカットを追加"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -38,55 +36,55 @@ msgid "Change file associations"
 msgstr "ファイル関連付けを変更する"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 msgid "Adjust PATH setting in registry"
 msgstr "レジストリの PATH 設定を調整する"
 
 #: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr "全ユーザ用に導入"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "TeXworks フロントエンドを導入"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s の導入"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "終了"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "←戻る"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "次へ→"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -99,12 +97,12 @@ msgstr ""
 "\n"
 "このガイドが、あなたの導入作業のご案内をします。"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
-msgstr "導入作業中はウィルス検知器を無効にするのが最善です。"
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -112,79 +110,77 @@ msgstr ""
 "微調節可能な熟練者向き導入作業については、\n"
 "ウェブページか導入ガイドをご覧ください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "あるいはinstall-tl-advanced.batをご使用ください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "あるいは、install-tlに--gui expertを指定してください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "既定リポジトリを変更"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "コマンドラインリポジトリ "
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "ローカルリポジトリ"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "ネットワークリポジトリ"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "既定リモートレポジトリ"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "リポジトリを選択"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "ミラー:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "大陸"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "国"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "ミラー"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "リポジトリデータベースが読み込まれるまでおまちください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "これには少し時間がかかります！"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -203,17 +199,17 @@ msgstr "これには少し時間がかかります！"
 msgid "Cancel"
 msgstr "取消"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "リモートTeX Liveデータベースを読み込めませんでした:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "前に戻って別のミラーを選択してください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -226,23 +222,24 @@ msgstr ""
 "ローカル　: %s\n"
 "リポジトリ: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "導入先フォルダ:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -258,7 +255,7 @@ msgstr "導入先フォルダ:"
 msgid "Change"
 msgstr "変更"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -266,32 +263,31 @@ msgstr ""
 "対象フォルダには、導入対象物が入ります。\n"
 "最後尾に年を入れたままにしておくことを強くお勧めします。"
 
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "必要ディスク領域:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr "（既定値が許されないか書き込み不能です―変更してください！）"
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "この変数のパスを入力→"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -319,11 +315,11 @@ msgstr "この変数のパスを入力→"
 msgid "Ok"
 msgstr "OK"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "この画面では、いくつかのオプションを設定することができます。"
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -336,146 +332,88 @@ msgstr ""
 "変更したいものがある場合には、前に戻ってください。\n"
 "そうでなければ、「導入」ボタンを押してください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "はい"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "いいえ"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "導入"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"説明書へのリンクは、%s/index.html をごらんください。\n"
-"TeX Live ウェブサイト（http://tug.org/texlive/）には、すべての更新と修正が掲"
-"載されて います。TeX Live は世界中の TeX ユーザーグループとの共同プロジェクト"
-"です。利用 しやすいグループに属することで、このプロジェクトを サポートしてい"
-"ただけると助かります。 グループの一覧は、ウェブ上の http://tug.org/"
-"usergroups.html にあります"
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"%s/texmf-dist/doc/manをMANPATHに加えてください．\n"
-"%s/texmf-dist/doc/infoをINFOPATHに加えてください．\n"
-"さらに重要なことですが，%s/bin/%s\n"
-"を現セッションと将来のセッション用にPATHに加えてください．"
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"導入の過程で警告が発せられました。\n"
-"警告メッセージは以下のとおりです。"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "TeX Live へようこそ！"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "終了"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "なし"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "新規のみ"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "全部"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "レター"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "読み込み"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -487,11 +425,11 @@ msgstr "読み込み"
 msgid "Warning"
 msgstr "警告"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "別のミラーを選択してください。"
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -506,31 +444,31 @@ msgstr ""
 "　リポジトリ: %s\n"
 "別のミラーを選択してください。"
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "基本情報"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "バイナリシステム"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "選択したスキーム"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "詳細設定"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "導入対象コレクション"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "ディレクトリ設定"
 
@@ -538,17 +476,16 @@ msgstr "ディレクトリ設定"
 msgid "Portable setup"
 msgstr "可搬設定"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -557,68 +494,77 @@ msgstr "可搬設定"
 msgid "Toggle"
 msgstr "入切"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR（TeX主幹ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL（サイト固有ファイル用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR（自動生成データ用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG（ローカル設定用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME（ユーザ固有ファイル用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "オプション"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "\\write18 を用いて制限リスト中のプログラムを実行することを許可"
 
-#: tlpkg/installer/install-menu-perltk.pl:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "フォーマットファイルをすべて生成"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "font と macro の doc ツリーを導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "font と macro のソースツリーを導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "システムディレクトリに symlink を作成する"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr "導入後，CTANからパッケージの更新を受け取る"
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "このプログラムについて"
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "TeX Live の導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "続行"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -626,7 +572,7 @@ msgstr ""
 "本導入プログラムは管理者権限を与えられていません．\n"
 "よって，現ユーザー用にしか導入することができません．"
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -634,88 +580,79 @@ msgstr ""
 "全ユーザー用に導入したい場合には，install-tl-advancedを右クリックして，\n"
 "\"runを管理者として選択してください．"
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "続行"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "導入プロセス"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "変数の値を変更"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "%s のパスを入力してください（%s を表すには ~ を使用してください）"
 
-#: tlpkg/installer/install-menu-perltk.pl:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "コレクションの任意選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "導入するコレクションを選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "すべてを選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "すべてを非選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "symlink を標準ディレクトリに作成する"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "バイナリリンク先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "man ページリンク先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "info リンク先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "arch-os を選択してください"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "主幹プラットフォームを取り除くことはできません！"
 
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s（全 %s 中）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s コレクション（全 %s コレクション中）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "（先に TEXDIR を変更してください！）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "（既定値では書き込みできません。変更してください！）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1634,6 +1571,51 @@ msgstr "Windows限定サポートプログラム"
 msgid "XeTeX and packages"
 msgstr "XeTeXとパッケージ"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr "導入作業中はウィルス検知器を無効にするのが最善です。"
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "説明書へのリンクは、%s/index.html をごらんください。\n"
+#~ "TeX Live ウェブサイト（http://tug.org/texlive/）には、すべての更新と修正が"
+#~ "掲載されて います。TeX Live は世界中の TeX ユーザーグループとの共同プロ"
+#~ "ジェクトです。利用 しやすいグループに属することで、このプロジェクトを サ"
+#~ "ポートしていただけると助かります。 グループの一覧は、ウェブ上の http://"
+#~ "tug.org/usergroups.html にあります"
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "%s/texmf-dist/doc/manをMANPATHに加えてください．\n"
+#~ "%s/texmf-dist/doc/infoをINFOPATHに加えてください．\n"
+#~ "さらに重要なことですが，%s/bin/%s\n"
+#~ "を現セッションと将来のセッション用にPATHに加えてください．"
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "導入の過程で警告が発せられました。\n"
+#~ "警告メッセージは以下のとおりです。"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "TeX Live へようこそ！"
+
+#~ msgid "Finish"
+#~ msgstr "終了"
+
+#~ msgid "Installation process"
+#~ msgstr "導入プロセス"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "数学パッケージ"
 
diff --git a/Master/tlpkg/translations/messages.pot b/Master/tlpkg/translations/messages.pot
index 083a73c84e3..13c58a63f12 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+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"
@@ -18,19 +18,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -38,55 +36,55 @@ msgid "Change file associations"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 msgid "Adjust PATH setting in registry"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -95,90 +93,88 @@ msgid ""
 "This wizard will guide you through the installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -197,17 +193,17 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -216,23 +212,24 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -248,38 +245,37 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 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:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -307,11 +303,11 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -320,134 +316,88 @@ msgid ""
 "otherwise press the \"Install\" button."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr ""
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -459,11 +409,11 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -473,31 +423,31 @@ msgid ""
 "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr ""
 
@@ -505,17 +455,16 @@ msgstr ""
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -524,161 +473,161 @@ msgstr ""
 msgid "Toggle"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 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:589
-msgid "Continue"
-msgstr ""
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr ""
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
diff --git a/Master/tlpkg/translations/nl.po b/Master/tlpkg/translations/nl.po
index 1008a5d4d87..eda46ecc2df 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+0200\n"
 "PO-Revision-Date: 2016-05-12 11:53+0200\n"
 "Last-Translator: Siep Kroonenberg <siepo@cybercomm.nl>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -14,19 +14,17 @@ msgstr ""
 "X-Generator: Poedit 1.8.4\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Standaard papier-formaat"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Maak TeX Live menu"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -34,55 +32,55 @@ msgid "Change file associations"
 msgstr "Wijzig bestandstypen"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 msgid "Adjust PATH setting in registry"
 msgstr "PATH aanpassen in registry"
 
 #: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr "Installeer voor alle gebruikers"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Installeer TeXworks front-end"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s Installatie"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Stoppen"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Terug"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Volgende >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -95,12 +93,12 @@ msgstr ""
 "\n"
 "Deze wizard zal u door de installatie leiden."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
-msgstr "U kunt het best uw virusscanner uitzetten tijdens installatie."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -108,79 +106,77 @@ msgstr ""
 "Raadpleeg voor een geavanceerde installatie op maat\n"
 "de web pagina's of de installatie-gids."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Of gebruik install-tl-advanced.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Of draai install-tl met de optie --gui expert."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Verander standaard installatie-bron"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Installatie-bron volgens commando-regel"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKALE INSTALLATIE-BRONNEN"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "ONLINE INSTALLATIE-BRONNEN"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Standaard online installatie-bron"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Selekteer installatie-bron"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Mirror:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Werelddeel"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Landen"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Mirrors"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "Wacht terwijl de database van de installatie-bron wordt geladen."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Dit gaat even duren!"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -199,17 +195,17 @@ msgstr "Dit gaat even duren!"
 msgid "Cancel"
 msgstr "Afbreken"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Kon de online TeX Live database niet laden:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Ga terug en kies een andere mirror."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -222,23 +218,24 @@ msgstr ""
 "  lokaal: %s\n"
 "  installatie-bron:%s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Bestemmings-folder"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -254,7 +251,7 @@ msgstr "Bestemmings-folder"
 msgid "Change"
 msgstr "Wijzig"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -262,32 +259,31 @@ 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:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "benodigde schijfruimte"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(default niet toegestaan of niet schrijfbaar - aub wijzigen!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Pad voor"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -315,11 +311,11 @@ msgstr "Pad voor"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "Met dit scherm kunt u enkele opties instellen."
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -332,146 +328,88 @@ msgstr ""
 "Ga terug als u iets wilt wijzigen,\n"
 "zo niet, klik dan op de \"Installeren\" knop."
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Ja"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Nee"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Installeren"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Zie %s/index.html voor links naar documentatie.\n"
-"De TeX Live web site (http://tug.org/texlive/) bevat\n"
-"eventuele updates en correcties.\n"
-"TeX Live is een gezamenlijk projekt van TeX gebruikersgroepen wereldwijd;\n"
-"overweeg ondersteuning door lid te worden van zo'n groep.\n"
-"De lijst van gebruikersgroepen staat op http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Voeg %s/texmf-dist/doc/man toe aan MANPATH.\n"
-"Voeg %s/texmf-dist/doc/info toe aan INFOPATH.\n"
-"En bovenal, voeg %s/bin/%s\n"
-"toe aan PATH voor huidige en toekomstige sessies."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Er waren enkele waarschuwingen gedurende installatie.\n"
-"Hier is de lijst van waarschuwingen:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Welkom bij TeX Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Sluit af"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Geen"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Alleen nieuw"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Alle"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Laad"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -483,11 +421,11 @@ msgstr "Laad"
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Kies een andere mirror."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -502,31 +440,31 @@ msgstr ""
 "  installatie-bron:%s\n"
 "Kies een andere mirror."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Basisinformatie"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Platform(s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Gekozen schema"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Verdere verfijning"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Installatie-collecties"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Folders"
 
@@ -534,17 +472,16 @@ msgstr "Folders"
 msgid "Portable setup"
 msgstr "Portable setup"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -553,68 +490,77 @@ msgstr "Portable setup"
 msgid "Toggle"
 msgstr "Wijzig"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (hoofd TeX-folder)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (voor lokale stijlen etc.)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (voor automatisch gegenereerde bestanden)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (voor lokale configuratie)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (voor eigen macros etc.)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Opties"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 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:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Genereer alle format bestanden"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Installeer font/macro doc folder"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Installeer font/macro bron folder"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Maak symlinks naar standaard-folders"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr "Aktualiseer pakketten vanuit CTAN na installatie"
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Info"
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Installeer TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Doorgaan"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -622,7 +568,7 @@ msgstr ""
 "Het installatie-programma heeft geen administratieve bevoegdheden;\n"
 "kan daarom alleen voor de huidige gebruiker installeren."
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -631,88 +577,79 @@ msgstr ""
 "\"\n"
 "als u voor alle gebruikers wilt installeren."
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "Doorgaan"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Installatie"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Nieuwe waarde"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Pad voor %s (gebruik ~ voor %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "Eigen selektie van collekties"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Kies te installeren collecties"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Kies alles"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Kies niets"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "Maak symlinks naar standaard-folders"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "programma's naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "manpages naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "info naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Kies platform(s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: 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:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s van %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collecties van %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(TEXDIR eerst veranderen!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(geen schrijf-toegang - wijzig!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1633,6 +1570,52 @@ msgstr "Ondersteunende programma's specifiek voor Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX en bijbehorende pakketten"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr "U kunt het best uw virusscanner uitzetten tijdens installatie."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Zie %s/index.html voor links naar documentatie.\n"
+#~ "De TeX Live web site (http://tug.org/texlive/) bevat\n"
+#~ "eventuele updates en correcties.\n"
+#~ "TeX Live is een gezamenlijk projekt van TeX gebruikersgroepen "
+#~ "wereldwijd;\n"
+#~ "overweeg ondersteuning door lid te worden van zo'n groep.\n"
+#~ "De lijst van gebruikersgroepen staat op http://tug.org/usergroups.html."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Voeg %s/texmf-dist/doc/man toe aan MANPATH.\n"
+#~ "Voeg %s/texmf-dist/doc/info toe aan INFOPATH.\n"
+#~ "En bovenal, voeg %s/bin/%s\n"
+#~ "toe aan PATH voor huidige en toekomstige sessies."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Er waren enkele waarschuwingen gedurende installatie.\n"
+#~ "Hier is de lijst van waarschuwingen:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Welkom bij TeX Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Sluit af"
+
+#~ msgid "Installation process"
+#~ msgstr "Installatie"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Wiskundige pakketten"
 
diff --git a/Master/tlpkg/translations/pl.po b/Master/tlpkg/translations/pl.po
index 637e2dfcba5..732facca880 100644
--- a/Master/tlpkg/translations/pl.po
+++ b/Master/tlpkg/translations/pl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+0200\n"
 "PO-Revision-Date: 2016-05-13 01:48+0100\n"
 "Last-Translator: Staszek Wawrykiewicz <staw@gust.org.pl>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -13,19 +13,17 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Domyślny format papieru"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Dodaj skróty do menu systemowego"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -33,55 +31,55 @@ msgid "Change file associations"
 msgstr "Zmiana skojarzeń typu plików"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 msgid "Adjust PATH setting in registry"
 msgstr "Zapis ustawienia PATH w pliku rejestru"
 
 #: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 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:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Instalacja edytora TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalowanie TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Zakończ"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "<Cofnij"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Dalej >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -94,12 +92,12 @@ msgstr ""
 "\n"
 "Uproszczona istalacja przeprowadzona zostanie w paru krokach."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
-msgstr "Podczas instalacji zalecamy wyłączyć skaner antywirusowy. "
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -108,79 +106,77 @@ msgstr ""
 "schematów, kolekcji itp.) opuść program i uruchom go\n"
 "z linii poleceń."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Lub użyj install-tl-advanced.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Lub podaj parametr --gui expert przy wywołaniu install-tl"
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Zmień domyślne repozytorium"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Repozytorium z linii poleceń"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKALNE REPOZYTORIA"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "REPOZYTORIA W SIECI"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Domyślne repozytorium"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Wybierz repozytorium"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Mirror (kopia CTAN):"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Kontynent"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Kraje"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Lustrzane kopie zasobów"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "Proszę czekać na wczytanie bazy danych repozytorium."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Trochę to potrwa..."
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -199,17 +195,17 @@ msgstr "Trochę to potrwa..."
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Nie można wczytać bazy danych TeX Live z sieci:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Cofnij i wybierz inną kopię zasobów (mirror) w sieci."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -222,23 +218,24 @@ msgstr ""
 "         lokalnie: %s\n"
 "repozytorium: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Docelowy folder:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -254,7 +251,7 @@ msgstr "Docelowy folder:"
 msgid "Change"
 msgstr "Zmień"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -262,33 +259,32 @@ msgstr ""
 "Docelowy folder będzie zawierał instalację.\n"
 "Zaleca się, aby ostatnim komponentem był rok wydania. "
 
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "wymagana przestrzeń na dysku:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 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:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Podaj ścieżkę dla"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -316,11 +312,11 @@ msgstr "Podaj ścieżkę dla"
 msgid "Ok"
 msgstr "Zatwierdź"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "Okno to pozwala skonfigurować niektóre ustawienia"
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -333,146 +329,88 @@ msgstr ""
 "(jeśli chcesz je zmienić, cofnij się,\n"
 "w przeciwnym wypadku naciśnij przycisk \"Instaluj\"):"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Tak"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Nie"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Instaluj"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Patrz %s/index.html z odnośnikami do dokumentacji.\n"
-"Na stronie TeX Live (http://tug.org/texlive/) znajdziesz aktualizacje i "
-"poprawki.\n"
-"TeX Live jest zbiorowym projektem grup użytkowników TeX-a z całego świata;\n"
-"proszę rozważyć wsparcie poprzez przystąpienie do grupy.\n"
-"Lista grup dostępna jest na stronie http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Dodaj %s/texmf-dist/doc/man do MANPATH.\n"
-"Dodaj %s/texmf-dist/doc/info do INFOPATH.\n"
-"Najważniejsze: dodaj %s/bin/%s\n"
-"do zmiennej PATH dla bieżącej i przyszłych sesji."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Podczas instalacji wystąpiło kilka ostrzeżeń.\n"
-"Oto ich podsumowanie:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "TeX Live wita!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Zakończ"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Nie"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Tylko dla nowych"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Dla wszystkich"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Wczytaj"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -484,11 +422,11 @@ msgstr "Wczytaj"
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Proszę wybrać inną kopię zasobów (mirror)."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -502,31 +440,31 @@ msgstr ""
 "w repozytoriium: %s\n"
 "Proszę wybrać inna kopię (mirror) repozytorium."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Informacje podstawowe"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Programy dla systemów operacyjnych"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Wybrany schemat instalacji"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Dalsze ustawienia"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Wybór kolekcji"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Wybór folderów"
 
@@ -534,17 +472,16 @@ msgstr "Wybór folderów"
 msgid "Portable setup"
 msgstr "Ustawienia dla instalacji przenośnej"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -553,68 +490,77 @@ msgstr "Ustawienia dla instalacji przenośnej"
 msgid "Toggle"
 msgstr "Zmień"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (główny folder dla instalacji)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (folder dla stylów, fontów itp. w lokalnej sieci)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (folder dla plików generowanych automatycznie)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (folder dla lokalnych plików konfiguracyjnych)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (folder dla prywatnych plików użytkownika)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Opcje"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Zezwalaj na uruchamienie wybranych programów via \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Generowanie wszystkich plików formatów"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Instalowanie dokumentacji fontu/makr"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Instalowanie plików źródłowych fontu/makr"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Dowiązania symboliczne w folderach systemowych"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr "Po instalacji pobieraj aktualizacje pakietów z CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: 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:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Zainstaluj TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Kontynuuj"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -622,7 +568,7 @@ msgstr ""
 "Program uruchomiono bez uprawnień administratora;\n"
 "instalacja tylko dla bieżącego użytkownika."
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -631,88 +577,79 @@ msgstr ""
 "\"Uruchom jako administrator\", jeśli chcesz dokonać instalacji\n"
 "dla wszystkich użytkowników."
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "Kontynuuj"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Instalacja w toku"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Zmień wartości zmiennych"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, 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:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "indywidualny wybór kolekcji"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Wybór kolekcji do zainstalowania"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Wybierz wszystko"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Wyłącz wszystko"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "Utwórz dowiązania symboliczne w standardowych folderach"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "Programy według"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "Strony man według"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "Dokumentacje info według"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Wybór systemu operacyjnego"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Usuwanie binariów dla głównej platformy jest niemożliwe!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s spośród %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcji spośród %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(proszę zmienić najpierw TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(domyślnie brak praw do zapisu - proszę zmienić!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1633,6 +1570,52 @@ msgstr "Dodatkowe programy tylko dla Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX i pakiety"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr "Podczas instalacji zalecamy wyłączyć skaner antywirusowy. "
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Patrz %s/index.html z odnośnikami do dokumentacji.\n"
+#~ "Na stronie TeX Live (http://tug.org/texlive/) znajdziesz aktualizacje i "
+#~ "poprawki.\n"
+#~ "TeX Live jest zbiorowym projektem grup użytkowników TeX-a z całego "
+#~ "świata;\n"
+#~ "proszę rozważyć wsparcie poprzez przystąpienie do grupy.\n"
+#~ "Lista grup dostępna jest na stronie http://tug.org/usergroups.html."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Dodaj %s/texmf-dist/doc/man do MANPATH.\n"
+#~ "Dodaj %s/texmf-dist/doc/info do INFOPATH.\n"
+#~ "Najważniejsze: dodaj %s/bin/%s\n"
+#~ "do zmiennej PATH dla bieżącej i przyszłych sesji."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Podczas instalacji wystąpiło kilka ostrzeżeń.\n"
+#~ "Oto ich podsumowanie:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "TeX Live wita!"
+
+#~ msgid "Finish"
+#~ msgstr "Zakończ"
+
+#~ msgid "Installation process"
+#~ msgstr "Instalacja w toku"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Pakiety do składu matematyki"
 
diff --git a/Master/tlpkg/translations/pt_BR.po b/Master/tlpkg/translations/pt_BR.po
index 350d72fa1ab..49fb58c6a22 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+0200\n"
 "PO-Revision-Date: 2015-05-06 17:26-0300\n"
 "Last-Translator: Paulo Roberto Massa Cereda <cereda@users.sf.net>\n"
 "Language-Team: Paulo Roberto Massa Cereda <cereda@users.sf.net>\n"
@@ -15,19 +15,17 @@ msgstr ""
 "X-Generator: Poedit 1.7.5\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Tamanho padrão do papel"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Adicionar atalhos de menu"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -35,55 +33,55 @@ msgid "Change file associations"
 msgstr "Alterar as associações de arquivos"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 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:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 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:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Instalar o editor TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalação do TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Sair"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Anterior"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Próximo >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -96,13 +94,12 @@ msgstr ""
 "\n"
 "Este assistente o guiará através da instalação."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
 msgstr ""
-"É recomendável desabilitar seu programa antivírus durante a instalação."
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -110,80 +107,78 @@ msgstr ""
 "Para uma instalação personalizada ou avançada, por favor\n"
 "consulte as páginas da web ou o guia de instalação."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Ou utilize install-tl-advanced.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Ou utilize o argumento '--gui expert' em install-tl."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Alterar repositório padrão"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Repositório de linha de comando"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "REPOSITÓRIOS LOCAIS"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "REPOSITÓRIOS DE REDE"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Repositório remoto padrão"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Selecione repositório"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Espelho:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Continente"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Países"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Espelhos"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 "Por favor, aguarde enquanto o banco de dados do repositório é carregado."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Isto vai levar algum tempo!"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -202,17 +197,17 @@ msgstr "Isto vai levar algum tempo!"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Não foi possível carregar o banco de dados remoto do TeX Live:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Por favor, retorne à etapa anterior e escolha um espelho diferente."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -225,23 +220,24 @@ msgstr ""
 "      local: %s\n"
 "repositório: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Diretório de destino:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -257,7 +253,7 @@ msgstr "Diretório de destino:"
 msgid "Change"
 msgstr "Alterar"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -265,33 +261,32 @@ 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:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "espaço em disco requerido:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 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:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Digite o caminho para"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -319,11 +314,11 @@ msgstr "Digite o caminho para"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 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:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -337,146 +332,88 @@ msgstr ""
 "às etapas anteriores; caso contrário, pressione o\n"
 "botão  \"Instalar\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Sim"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Não"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Instalar"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Consulte %s/index.html para links de documentação.\n"
-"O site web do TeX Live (http://tug.org/texlive/) contém todas as "
-"atualizações e correções. O TeX Live é um projeto em conjunto com os grupos "
-"de usuários TeX ao redor do mundo; por favor, considere apoiar a iniciativa "
-"registrando-se em um destes grupos. A lista de grupos está disponível na web "
-"através do endereço http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Adicione %s/texmf-dist/doc/man em MANPATH.\n"
-"Adicione %s/texmf-dist/doc/info em INFOPATH.\n"
-"E o mais importante, adicione %s/bin/%s\n"
-"em seu PATH para a sessão atual e todas as sessões futuras."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Alguns avisos foram gerados durante o processo de instalação.\n"
-"Aqui está a lista de mensagens de aviso:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Bem-vindo ao TeX Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Finalizar"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Nenhum"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Apenas novos"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Todos"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "carta"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Carregar"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -488,11 +425,11 @@ msgstr "Carregar"
 msgid "Warning"
 msgstr "Aviso"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Por favor, selecione um espelho diferente."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -507,31 +444,31 @@ msgstr ""
 "  repositório: %s\n"
 "Por favor, selecione um espelho diferente."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Informação básica"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Sistema(s) binário(s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Esquema selecionado"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Personalização adicional"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Coleções da instalação"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Configuração de diretório"
 
@@ -539,17 +476,16 @@ msgstr "Configuração de diretório"
 msgid "Portable setup"
 msgstr "Configuração portátil"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -558,68 +494,77 @@ msgstr "Configuração portátil"
 msgid "Toggle"
 msgstr "Alternar"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (o diretório TeX principal)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (diretório para arquivos locais)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (diretório para dados gerados automaticamente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (diretório para configuração local)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (diretório para arquivos específicos do usuário)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Opções"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 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:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Criar todos os formatos de arquivos"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Instalar árvore de documentação de fontes/macros"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Instalar a árvore de código-fonte de fontes/macros"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Criar links simbólicos nos diretórios do sistema"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 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:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Sobre"
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Instalar o TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Continuar"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -627,7 +572,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:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -636,88 +581,79 @@ msgstr ""
 "\"executar como administrador\" se você desejar instalar TeX Live\n"
 "para todos os usuários."
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "Continuar"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Processo de instalação"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Alterar valor da variável"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, 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:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "seleção personalizada de coleções"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Selecione as coleções a serem instaladas"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Remover seleção de tudo"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "criar links simbólicos nos diretórios padrão"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "binários para"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "páginas de manual para"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "informação para"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Selecionar arquitetura do sistema operacional"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: 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:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s de %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s coleções de %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(por favor, altere TEXDIR primeiro!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 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:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1644,6 +1580,52 @@ msgstr "Programas de suporte exclusivos para Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX e pacotes"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr ""
+#~ "É recomendável desabilitar seu programa antivírus durante a instalação."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Consulte %s/index.html para links de documentação.\n"
+#~ "O site web do TeX Live (http://tug.org/texlive/) contém todas as "
+#~ "atualizações e correções. O TeX Live é um projeto em conjunto com os "
+#~ "grupos de usuários TeX ao redor do mundo; por favor, considere apoiar a "
+#~ "iniciativa registrando-se em um destes grupos. A lista de grupos está "
+#~ "disponível na web através do endereço http://tug.org/usergroups.html."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Adicione %s/texmf-dist/doc/man em MANPATH.\n"
+#~ "Adicione %s/texmf-dist/doc/info em INFOPATH.\n"
+#~ "E o mais importante, adicione %s/bin/%s\n"
+#~ "em seu PATH para a sessão atual e todas as sessões futuras."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Alguns avisos foram gerados durante o processo de instalação.\n"
+#~ "Aqui está a lista de mensagens de aviso:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Bem-vindo ao TeX Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Finalizar"
+
+#~ msgid "Installation process"
+#~ msgstr "Processo de instalação"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Pacotes matemáticos"
 
diff --git a/Master/tlpkg/translations/ru.po b/Master/tlpkg/translations/ru.po
index 877e8f65984..6e076ba4aad 100644
--- a/Master/tlpkg/translations/ru.po
+++ b/Master/tlpkg/translations/ru.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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+0200\n"
 "PO-Revision-Date: 2015-04-30 21:04+0800\n"
 "Last-Translator: Vladimir Lomov <irk.translator@yandex.ru>\n"
 "Language-Team: Russian <tldoc@tug.org>\n"
@@ -20,19 +20,17 @@ msgstr ""
 "X-Generator: Poedit 1.7.5\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Формат страницы по умолчанию"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Добавить в меню «Пуск»"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -40,55 +38,55 @@ msgid "Change file associations"
 msgstr "Изменить привязку файлов"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 msgid "Adjust PATH setting in registry"
 msgstr "Добавить в переменную PATH"
 
 #: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr "Доступно для всех пользователей"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Установить редактор TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Установка TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Выход"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Назад"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Далее >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -101,12 +99,12 @@ msgstr ""
 "\n"
 "Этот помощник проведёт вас через процедуру установки."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
-msgstr "Рекомендуем отключить вашу антивирусную программу на время установки."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -114,79 +112,77 @@ msgstr ""
 "Для более гибкой настройки установки просмотрите\n"
 "web-страницы или руководство по установке."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Или используйте install-tl-advanced.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Или используйте опцию --gui expert для install-tl."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Изменить репозиторий по умолчанию"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Репозиторий указанный в командной строке"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "ЛОКАЛЬНЫЕ РЕПОЗИТОРИИ"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "СЕТЕВЫЕ РЕПОЗИТОРИИ"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Сетевой репозиторий по умолчанию"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Выбрать репозиторий"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Зеркало:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Материк"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Страны"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Зеркала"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "Подождите пока загрузится база данных репозитория."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Это займёт некоторое время!"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -205,17 +201,17 @@ msgstr "Это займёт некоторое время!"
 msgid "Cancel"
 msgstr "Отмена"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Невозможно загрузить сетевую базу данных TeX Live:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Вернитесь назад и выберите другое зеркало."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -228,23 +224,24 @@ msgstr ""
 "    локальная: %s\n"
 "в репозитории: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Целевой каталог:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -260,7 +257,7 @@ msgstr "Целевой каталог:"
 msgid "Change"
 msgstr "Изменить"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -268,34 +265,33 @@ msgstr ""
 "В целевом каталоге будут размещены установленные файлы.\n"
 "Настоятельно рекомендуем сохранить год выпуска дистрибутива в его названии."
 
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "требуется места на диске:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 "(нет доступа или прав на запись для каталога по умолчанию — задайте другое "
 "значение!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Введите путь для"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -323,11 +319,11 @@ msgstr "Введите путь для"
 msgid "Ok"
 msgstr "Ок"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "В этом окне можно настроить некоторые параметры"
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -340,145 +336,88 @@ msgstr ""
 "Если нужно что-то изменить, нажмите кнопку «Назад»,\n"
 "если всё в порядке, нажмите кнопку «Установить»."
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Да"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Нет"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Установить"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Ссылки на документацию можно найти в %s/index.html\n"
-"На сайте TeX Live (http://tug.org/texlive/) публикуются последние обновления "
-"и исправления. TeX Live — это совместный проект групп пользователей TeX'а со "
-"всей планеты; поддержите проект, присоединившись к подходящей вам группе. "
-"Список групп доступен на странице http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Добавьте %s/texmf-dist/doc/man в MANPATH.\n"
-"Добавьте %s/texmf-dist/doc/info в INFOPATH.\n"
-"И самое главное, добавьте %s/bin/%s\n"
-"в ваш PATH для текущей и будущих сессий."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"В процессе установки появлялось несколько предупреждений.\n"
-"Вот список этих предупреждений:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Вас приветствует TeX Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Закончить"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Нет"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Только новые"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Все"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "А4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "Letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Загрузить"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -490,11 +429,11 @@ msgstr "Загрузить"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Выберите другое зеркало."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -509,31 +448,31 @@ msgstr ""
 "в репозитории: %s\n"
 "Выберите другое зеркало."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Базовая настройка"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Программы для систем(ы)"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Выбранная схема"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Дополнительные настройки"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Коллекции для установки"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Подготовка каталогов"
 
@@ -541,17 +480,16 @@ msgstr "Подготовка каталогов"
 msgid "Portable setup"
 msgstr "Настройка для мобильного использования"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -560,68 +498,77 @@ msgstr "Настройка для мобильного использовани�
 msgid "Toggle"
 msgstr "Переключить"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (основной каталог TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (системный каталог для локальных файлов)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (системный каталог для автоматически создаваемых данных)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (системный каталог для локальных настроек)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (каталог для личных файлов пользователей)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Параметры"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Разрешить выполнение ограниченного набора программ через \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Создать все форматные файлы"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Установить дерево с документацией font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Установить дерево исходных файлов font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Создать символьные ссылки в системных каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr "После установки, получайте обновления пакетов с CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "О программе"
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Установить TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Продолжить"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -629,7 +576,7 @@ msgstr ""
 "Программа установки не была запущена с правами администратора,\n"
 "установка будет выполнена только для текущего пользователя."
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -637,88 +584,79 @@ msgstr ""
 "Если вы хотите установить для всех пользователей, нажмите правой кнопкой\n"
 "мыши на install-tl-advanced и выберите «Запуск от имени администратора»."
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "Продолжить"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Процесс установки"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Изменить значение переменной"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Введите путь для %s (используйте ~ для %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "выбор коллекций"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Выберите устанавливаемые коллекции"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Выбрать всё"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Снять выделение"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "создать символьные ссылки в стандартных каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "программы в"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "страницы man в"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "страницы info в"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Выберите архитектуру-ОС"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Удаление основной архитектуры невозможно!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s из %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s коллекций из %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(измените сначала TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(нет прав на запись в каталог по умолчанию — измените!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1639,6 +1577,52 @@ msgstr "Вспомогательные программы, только для W
 msgid "XeTeX and packages"
 msgstr "XeTeX и пакеты"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr ""
+#~ "Рекомендуем отключить вашу антивирусную программу на время установки."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Ссылки на документацию можно найти в %s/index.html\n"
+#~ "На сайте TeX Live (http://tug.org/texlive/) публикуются последние "
+#~ "обновления и исправления. TeX Live — это совместный проект групп "
+#~ "пользователей TeX'а со всей планеты; поддержите проект, присоединившись к "
+#~ "подходящей вам группе. Список групп доступен на странице http://tug.org/"
+#~ "usergroups.html."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Добавьте %s/texmf-dist/doc/man в MANPATH.\n"
+#~ "Добавьте %s/texmf-dist/doc/info в INFOPATH.\n"
+#~ "И самое главное, добавьте %s/bin/%s\n"
+#~ "в ваш PATH для текущей и будущих сессий."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "В процессе установки появлялось несколько предупреждений.\n"
+#~ "Вот список этих предупреждений:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Вас приветствует TeX Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Закончить"
+
+#~ msgid "Installation process"
+#~ msgstr "Процесс установки"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Пакеты для математики"
 
diff --git a/Master/tlpkg/translations/sk.po b/Master/tlpkg/translations/sk.po
index 1a5d8cd0a80..3f34249c3a7 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+0200\n"
 "PO-Revision-Date: 2015-05-02 04:45+0100\n"
 "Last-Translator: Ján Buša <jan.busa@tuke.sk>\n"
 "Language-Team:  <tex-live@tug.org>\n"
@@ -15,19 +15,17 @@ msgstr ""
 
 # Slovak translation update - Jan Busa 02/05/15.
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Predvolený rozmer papiera"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Pridať skratky ponuky"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -35,55 +33,55 @@ msgid "Change file associations"
 msgstr "Zmeniť priradenia súborov"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 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:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 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:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Nainštalovať pomocný program TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Inštalácia TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Späť"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Ďalej >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -96,12 +94,12 @@ msgstr ""
 "\n"
 "Tento sprievdoca Vás bude viesť počas inštalácie."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
-msgstr "Najlepšie je počas inštalácie odpojiť antivírusový program."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -109,79 +107,77 @@ msgstr ""
 "Pre prípad pokročilej prispôsobiteľnej inštalácie sa, prosím, poraďte\n"
 "na internetovskej stránke alebo v inštalačnej príručke."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Alebo použite install-tl-advanced.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Alebo uveďte --gui expert pre install-tl."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Zmeniť predvolenú schránku"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Schránka príkazových riadkov"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKÁLNE SCHRÁNKY"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "SIEŤOVÉ SCHRÁNKY"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Predvolená vzdialená schránka"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Zvoliť schránku"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Zrkadlo:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Kontinent"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Krajiny"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Zrkadlá"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "Počkajte, prosím, kým sa načíta databáza stránok."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Bude to trvať istý čas!"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -200,17 +196,17 @@ msgstr "Bude to trvať istý čas!"
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Nepodarilo sa načítať vzdialenú databázu TeX Live:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Vráťte sa, prosím a zvoľte iné zrkadlo."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -223,23 +219,24 @@ msgstr ""
 "     lokálne: %s\n"
 "schránka: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Cieľový adresár:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -255,7 +252,7 @@ msgstr "Cieľový adresár:"
 msgid "Change"
 msgstr "Zmeniť"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -263,34 +260,33 @@ 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:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "požadovaný diskový priestor:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 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:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Vložte cestu pre"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -318,11 +314,11 @@ msgstr "Vložte cestu pre"
 msgid "Ok"
 msgstr "OK"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 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:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -335,146 +331,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:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Áno"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Nie"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Nainštalovať"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Pozrite si %s/index.html ohľadom odkazov na dokumentáciu.\n"
-"Webová stránka systému TeX Live (http://tug.org/texlive/) obsahuje všetky "
-"aktualizácie a opravy. TeX Live je spoločný projekt skupín používateľov TeXu "
-"z celého sveta; pouvažujte, prosím, o jeho podpore pridaním sa ku skupine, "
-"ktorá je Vám najbližšia. Zoznam skupín je k dispozícii na webe na stránke "
-"http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Pridajte %s/texmf-dist/doc/man ku MANPATH.\n"
-"Pridajte %s/texmf-dist/doc/info ku INFOPATH.\n"
-"Ako najdôležitejšie pridajte  %s/bin/%s\n"
-"ku Vašej premennej PATH pre aktuálnu a budúcu prácu."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Počas inštalácie sa vyskytli nejaké varovania.\n"
-"Tu je prehľad výstražných správ:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Vitajte vo svete TeX Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Dokončiť"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Žiaden"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Len nové"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Všetky"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Načítať"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -486,11 +424,11 @@ msgstr "Načítať"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Zvoľte, prosím, iné zrkadlo."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -505,31 +443,31 @@ msgstr ""
 "  schránka: %s\n"
 "Zvoľte, prosím, iné zrkadlo."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Základné informácie"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Binárny(e) systém(y)"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Zvolená schéma"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Ďalšie prispôsobenie"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Inštalačné kolekcie"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Nastavenie adresára"
 
@@ -537,17 +475,16 @@ msgstr "Nastavenie adresára"
 msgid "Portable setup"
 msgstr "Prenosné nastavenie"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -556,70 +493,79 @@ msgstr "Prenosné nastavenie"
 msgid "Toggle"
 msgstr "Prepnúť"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (hlavný TeXovský adresár)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (adresár na umiestnenie lokálnych súborov)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (adresár vygenerovaných súborov)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (adresár pre lokálnu konfiguráciu)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (adresár užívateľských súborov)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Voľby"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 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:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Vytvoriť všetky formátové súbory"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Nainštalovať strom dokumentácie fontov/makier"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Nainštalovať strom zdrojových súborov fontov/makier"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Vytvoriť symbolické odkazy v systémových adresároch"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr "Po inštalácii aktualizujte balíky z CTANu"
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: 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:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Nainštalovať TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Pokračovať"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -627,7 +573,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:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -637,88 +583,79 @@ msgstr ""
 " na  install-tl-advanced a zvoľte \"run as administrator/spustiť ako "
 "administrátor\". "
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "Pokračovať"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Proces inštalácie"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Zmeniť hodnotu premennej"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, 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:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "používateľská voľba zbierok"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Zvoliť kolekcie, ktore majú byť nainštalované."
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Zvoliť všetky"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Zrušiť všetky voľby"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "vytvoriť symbolické linky v štandardných adresároch"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "binárky do"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "dokumentáciu manpages do"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "informáciu do"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Zvoliť architektúru resp. operačný systém"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: 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:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcií z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(zmeňte najprv TEXDIR, prosím!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(predvolené miesto neumožňuje zápis - zmeňte, prosím!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1641,6 +1578,51 @@ msgstr "Podporné programy len pre Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX a balíky"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr "Najlepšie je počas inštalácie odpojiť antivírusový program."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Pozrite si %s/index.html ohľadom odkazov na dokumentáciu.\n"
+#~ "Webová stránka systému TeX Live (http://tug.org/texlive/) obsahuje všetky "
+#~ "aktualizácie a opravy. TeX Live je spoločný projekt skupín používateľov "
+#~ "TeXu z celého sveta; pouvažujte, prosím, o jeho podpore pridaním sa ku "
+#~ "skupine, ktorá je Vám najbližšia. Zoznam skupín je k dispozícii na webe "
+#~ "na stránke http://tug.org/usergroups.html."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Pridajte %s/texmf-dist/doc/man ku MANPATH.\n"
+#~ "Pridajte %s/texmf-dist/doc/info ku INFOPATH.\n"
+#~ "Ako najdôležitejšie pridajte  %s/bin/%s\n"
+#~ "ku Vašej premennej PATH pre aktuálnu a budúcu prácu."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Počas inštalácie sa vyskytli nejaké varovania.\n"
+#~ "Tu je prehľad výstražných správ:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Vitajte vo svete TeX Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Dokončiť"
+
+#~ msgid "Installation process"
+#~ msgstr "Proces inštalácie"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Matematické balíky"
 
diff --git a/Master/tlpkg/translations/sl.po b/Master/tlpkg/translations/sl.po
index 3f679d9b710..b2f7ed6d0a1 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+0200\n"
 "PO-Revision-Date: 2013-05-30 10:00+0100\n"
 "Last-Translator: Mojca Miklavec <mojca.miklavec.lists@gmail.com>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -15,19 +15,17 @@ msgstr ""
 "X-Generator: Poedit 1.7.6\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Privzet format papirja"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Dodaj menijske bližnjice"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -36,56 +34,56 @@ msgid "Change file associations"
 msgstr "Spremeni asociacije končnic datotek"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 #, 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:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr "Namestitev za vse uporabnike"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Namesti urejevalnik TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Namestitev TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Izhod"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Nazaj"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Naprej >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -98,14 +96,12 @@ msgstr ""
 "\n"
 "Ta čarovnik vas bo vodil skozi namestitev."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
 msgstr ""
-"Nekateri antivirusni programi lahko opazno upočasnijo ali onemogočijo "
-"namestitev. V primeru težav jih lahko poskusite začasno izklopiti."
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -113,83 +109,81 @@ msgstr ""
 "Pri napredni namestitvi z več možnostmi si lahko pomagate\n"
 "s spletno stranjo ali namestitvenim priročnikom."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Lahko uporabite 'install-tl-advanced.bat'."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 #, fuzzy
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Lahko uporabite opcijo '--gui expert' za 'install-tl'."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Zamenjaj privzeti repozitorij"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 #, fuzzy
 msgid "Command line repository"
 msgstr "Repozitorij za uporabo v ukazni vrstici"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKALNI REPOZITORIJI"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "MREŽNI REPOZITORIJI"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 #, fuzzy
 msgid "Default remote repository"
 msgstr "Privzeti spletni repozitorij"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Izberi repozitorij"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Zrcalni strežnik:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Kontinent"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Države"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Zrcalni strežniki"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 #, fuzzy
 msgid "Please wait while the repository database is loaded."
 msgstr "Podatkovna baza iz repozitorija se nalaga. Prosimo počakajte."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "To utegne trajati nekaj časa."
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -208,19 +202,19 @@ msgstr "To utegne trajati nekaj časa."
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 #, fuzzy
 msgid "Could not load remote TeX Live Database:"
 msgstr "Ni bilo mogoče naložiti oddaljene baze paketkov za TeX Live:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 #, fuzzy
 msgid "Please go back and select a different mirror."
 msgstr "Prosimo vrnite se in izberite drugi zrcalni strežnik."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -232,23 +226,24 @@ msgstr ""
 "nameščena verzija: %s\n"
 "verzija na strežniku: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Ciljni imenik:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -264,7 +259,7 @@ msgstr "Ciljni imenik:"
 msgid "Change"
 msgstr "Spremeni"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 #, fuzzy
 msgid ""
 "The destination folder will contain the installation.\n"
@@ -273,33 +268,32 @@ msgstr ""
 "Namestitev bo opravljena v ciljni imenik.\n"
 "Priporočljivo je uporabiti letnico na koncu imena."
 
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 #, fuzzy
 msgid "disk space required:"
 msgstr "prostor na disku:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 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:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Nastavite pot do"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -327,11 +321,11 @@ msgstr "Nastavite pot do"
 msgid "Ok"
 msgstr "V redu"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "Ta zaslon omogoča nastavitev nekaterih opcij"
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -344,147 +338,89 @@ msgstr ""
 "Če bi radi karkoli spremenili, se vrnite nazaj,\n"
 "sicer pritisnite gumb \"Namesti\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Da"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Ne"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Namesti"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Glej %s/index.html za povezave do dokumentacije. Na domači strani\n"
-"(http://tug.org/texlive/) lahko najdete posodobitve in popravke.\n"
-"TeX Live je skupni projekt društev uporabnikov TeX-a širom sveta;\n"
-"podprete ga lahko s pristopom k enemu izmed njih. \n"
-"Seznam društev uporabnikov TeX-a je na voljo na http://tug.org/usergroups."
-"html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Dodajte %s/texmf-dist/doc/man v spremenljivko MANPATH.\n"
-"Dodajte %s/texmf-dist/doc/info v spremenljivko INFOPATH.\n"
-"Najpomembneje - dodajte %s/bin/%s v spremenljivko PATH."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-#, fuzzy
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Med namestitvijo je prišlo do manjših težav.\n"
-"Tu je seznam opozoril:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Dobrodošli v TeX Live-u!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Konec"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 #, fuzzy
 msgid "None"
 msgstr "Brez"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Samo nove"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Vse"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Naloži"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -496,12 +432,12 @@ msgstr "Naloži"
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 #, fuzzy
 msgid "Please select a different mirror."
 msgstr "Prosimo izberite drugi zrcalni strežnik."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -515,31 +451,31 @@ msgstr ""
 "verzija na strežniku: %s\n"
 "Prosimo izberite drugi zrcalni strežnik."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Osnovne nastavitve"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Izbrani operacijski sistemi in arhitekture"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Izbrana shema"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Napredne nastavitve"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Izbrane zbirke paketov"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Nastavitve imenikov"
 
@@ -547,17 +483,16 @@ msgstr "Nastavitve imenikov"
 msgid "Portable setup"
 msgstr "Prenosljiva namestitev"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -566,68 +501,77 @@ msgstr "Prenosljiva namestitev"
 msgid "Toggle"
 msgstr "Vključi/Izključi"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (vrhnji TeX direktorij)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (lokalne datoteke)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (samodejno generirane datoteke)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (lokalna konfiguracija)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (uporabnikove datoteke)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Možnosti"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Dovoli izvajanje omejenega števila programov z \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Generiraj vse formate"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Namesti dokumentacijo"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Namesti izvorno kodo"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Namesti simbolne povezave v sistemske mape"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr "Po namestitvi prenesi posodobitve iz CTAN-a"
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: 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:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Namesti TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Nadaljuj"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 #, fuzzy
 msgid ""
 "The installer does not have adminstrative permissions;\n"
@@ -636,7 +580,7 @@ msgstr ""
 "Namestitveni program nima administratorskih pravic,\n"
 "zato lahko TeX Live namesti le za trenutnega uporabnika."
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -644,91 +588,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:589
-msgid "Continue"
-msgstr "Nadaljuj"
-
-# 1. zavihek
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-#, fuzzy
-msgid "Installation process"
-msgstr "Potek namestitve"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Nova vrednost spremenljivke"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, 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:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "namestitev paketov po izbiri"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Zbirke, ki naj se namestijo"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Briši izbor"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "ustvari simbolne povezave v sistemskih imenikih"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "binarne datoteke v"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "'man' strani v"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "info strani v"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Izbrane platforme"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: 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:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s od %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s zbirk od %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(Spremenite TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(Spremenite imenik - pisanje v izbrani imenik je zaščiteno!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1705,6 +1638,55 @@ msgstr "Programi za MS Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX s paketi"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr ""
+#~ "Nekateri antivirusni programi lahko opazno upočasnijo ali onemogočijo "
+#~ "namestitev. V primeru težav jih lahko poskusite začasno izklopiti."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Glej %s/index.html za povezave do dokumentacije. Na domači strani\n"
+#~ "(http://tug.org/texlive/) lahko najdete posodobitve in popravke.\n"
+#~ "TeX Live je skupni projekt društev uporabnikov TeX-a širom sveta;\n"
+#~ "podprete ga lahko s pristopom k enemu izmed njih. \n"
+#~ "Seznam društev uporabnikov TeX-a je na voljo na http://tug.org/usergroups."
+#~ "html."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Dodajte %s/texmf-dist/doc/man v spremenljivko MANPATH.\n"
+#~ "Dodajte %s/texmf-dist/doc/info v spremenljivko INFOPATH.\n"
+#~ "Najpomembneje - dodajte %s/bin/%s v spremenljivko PATH."
+
+#, fuzzy
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Med namestitvijo je prišlo do manjših težav.\n"
+#~ "Tu je seznam opozoril:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Dobrodošli v TeX Live-u!"
+
+#~ msgid "Finish"
+#~ msgstr "Konec"
+
+# 1. zavihek
+#, fuzzy
+#~ msgid "Installation process"
+#~ msgstr "Potek namestitve"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Matematični paketi"
 
diff --git a/Master/tlpkg/translations/sr.po b/Master/tlpkg/translations/sr.po
index c6ef09f44d6..a53261d3a11 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+0200\n"
 "PO-Revision-Date: 2016-04-30 18:49+0300\n"
 "Last-Translator: Nikola Lečić <nikola.lecic@anthesphoria.net>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -20,19 +20,17 @@ msgstr ""
 "X-Poedit-Country: Serbia\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Подразумевана величина папира"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Додати пречице у менију"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -40,55 +38,55 @@ msgid "Change file associations"
 msgstr "Повежи типове фајлова са одговарајућим програмима"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 msgid "Adjust PATH setting in registry"
 msgstr "Подеси PATH вредност у Registry"
 
 #: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr "Инсталација за све кориснике"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Инсталирај специјализовани едитор TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s: инсталација"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Напусти програм"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Назад"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Напред >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -101,12 +99,12 @@ msgstr ""
 "\n"
 "Овај програм ће Вас провести кроз процес инсталације."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
-msgstr "Препоручује се искључивање антивирусних програма током инсталације."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -114,79 +112,77 @@ msgstr ""
 "Ако желите инсталацију са већим избором опција,\n"
 "погледајте упутство на Интернету или Приручник."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Можете да употребите и install-tl-advanced.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Или, позовите скрипту install-tl са параметром --gui expert."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Промена подразумеваног репозиторијума"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Репозиторијум са командне линије"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "ЛОКАЛНИ РЕПОЗИТОРИЈУМИ"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "МРЕЖНИ РЕПОЗИТОРИЈУМИ"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Подразумевани удаљени репозиторијум"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Изаберите репозиторијум"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Огледало (mirror):"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Континент"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Државе"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Огледала (mirrors)"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "Сачекајте док се не учита база података са репозиторијума."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Ово ће потрајати неко време!"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -205,17 +201,17 @@ msgstr "Ово ће потрајати неко време!"
 msgid "Cancel"
 msgstr "Прекини"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Учитавање удаљене TeX Live базе података није успело:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Вратите се назад и изаберите друго огледало (mirror)."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -228,23 +224,24 @@ msgstr ""
 "          локална верзија: %s\n"
 "верзија са репозиторијума: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Циљни директоријум:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -260,7 +257,7 @@ msgstr "Циљни директоријум:"
 msgid "Change"
 msgstr "Промени"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -268,32 +265,31 @@ msgstr ""
 "Директоријум у који ће се сместити инсталирани материјал.\n"
 "Препоручујемо да задржите годину као последњи члан."
 
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "потребан простор на диску:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(подразумевани директоријум је неуписив - промените га!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Унесите путању за"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -321,11 +317,11 @@ msgstr "Унесите путању за"
 msgid "Ok"
 msgstr "У реду"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "На овом екрану можете да подесите неке параметре"
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -338,146 +334,88 @@ msgstr ""
 "Ако желите да нешто промените, вратите се назад,\n"
 "иначе притисните дугме „Инсталирај“."
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "да"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "не"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Инсталирај"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Линкови за документацију налазе се у %s/index.html.\n"
-"На Интернет-страници TeX Live-а (http://tug.org/texlive/) налазе се "
-"расположиве надоградње и исправке. TeX Live је заједнички пројекат група "
-"корисника TeX-а из свих делова света; молимо Вас да размотрите могућност "
-"подршке путем прикључивања групи која Вам највише одговара. Списак група "
-"налази се на Интернет-страници http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Додајте %s/texmf-dist/doc/man у MANPATH.\n"
-"Додајте %s/texmf-dist/doc/info у INFOPATH.\n"
-"И, најважније од свега, додајте %s/bin/%s\n"
-"у PATH ове и свих будућих сесија."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Било је неких упозорења током инсталационог процеса.\n"
-"Следи преглед тих порука:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Добродошли у TeX Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Заврши"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Ништа"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Само нови"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Све"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Учитај"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -489,11 +427,11 @@ msgstr "Учитај"
 msgid "Warning"
 msgstr "Упозорење"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Изаберите друго огледало (mirror)."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -508,31 +446,31 @@ msgstr ""
 "верзија са репозиторијума: %s\n"
 "Молимо Вас да изаберете друго огледало (mirror)."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Основни подаци"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Платформе (архитектуре и оперативни системи)"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Изабрана шема"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Додатна подешавања"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Колекције пакета и програма"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Подешавање директоријума"
 
@@ -540,17 +478,16 @@ msgstr "Подешавање директоријума"
 msgid "Portable setup"
 msgstr "Преносива инсталација"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -559,68 +496,77 @@ msgstr "Преносива инсталација"
 msgid "Toggle"
 msgstr "Обрни"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (главни TeX директоријум)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (директоријум за општеважеће локалне фајлове)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (директоријум за аутоматски направљене податке)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (директоријум за локална подешавања)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (директоријум за корисникове фајлове)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Подешавања"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Дозволи покретање ограничене листе програма путем \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Направи све фајлове са форматима"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Инсталирај документацију за фонтове и макрое"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Инсталирај изворни код фонтова и макроа"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Направи симболичке линкове у системским директоријумима"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr "После инсталације обнављати пакете преко CTAN-а"
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "О програму"
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Инсталирај TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Продужити"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -629,7 +575,7 @@ msgstr ""
 "за тренутног корисника зато што нема системска\n"
 "овлашћења."
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -638,90 +584,81 @@ msgstr ""
 "\"run as administrator\" (\"покрени као администратор\") ако желите\n"
 "да инсталација важи за све кориснике."
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "Продужити"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Процес инсталације"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Промена вредности променљиве"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Унесите путању за %s (употребите ~ као замену за %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "произвољан избор колекција"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Изаберите колекције које ће бити инсталиране"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Изабери све"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Уклони све ознаке"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "Направи симболичке линкове у стандардним директоријумима"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "Стави бинарне фајлове у"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "Стави man странице у"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "Стави info странице у"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr ""
 "Изаберите платформу\n"
 "(архитектура - оперативни систем)"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Уклањање главне платформе није могуће!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s од укупно %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s колекција од укупно %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(прво промените TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(није могуће уписивање на подразумевану локацију - промените је!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1645,6 +1582,51 @@ msgstr "Помоћни програми за Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX и повезани пакети"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr "Препоручује се искључивање антивирусних програма током инсталације."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Линкови за документацију налазе се у %s/index.html.\n"
+#~ "На Интернет-страници TeX Live-а (http://tug.org/texlive/) налазе се "
+#~ "расположиве надоградње и исправке. TeX Live је заједнички пројекат група "
+#~ "корисника TeX-а из свих делова света; молимо Вас да размотрите могућност "
+#~ "подршке путем прикључивања групи која Вам највише одговара. Списак група "
+#~ "налази се на Интернет-страници http://tug.org/usergroups.html."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Додајте %s/texmf-dist/doc/man у MANPATH.\n"
+#~ "Додајте %s/texmf-dist/doc/info у INFOPATH.\n"
+#~ "И, најважније од свега, додајте %s/bin/%s\n"
+#~ "у PATH ове и свих будућих сесија."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Било је неких упозорења током инсталационог процеса.\n"
+#~ "Следи преглед тих порука:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Добродошли у TeX Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Заврши"
+
+#~ msgid "Installation process"
+#~ msgstr "Процес инсталације"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Математички пакети"
 
diff --git a/Master/tlpkg/translations/uk.po b/Master/tlpkg/translations/uk.po
index 530b7ef009a..8476818b8bf 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+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"
@@ -19,19 +19,17 @@ msgstr ""
 "X-Generator: Lokalize 1.5\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr "Типовий розмір паперу"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr "Додати ярлики у меню"
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -39,55 +37,55 @@ msgid "Change file associations"
 msgstr "Змінити асоціації файлів"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 msgid "Adjust PATH setting in registry"
 msgstr "Додати параметр PATH у реєстр"
 
 #: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr "Встановити для усіх користувачів"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Установити редактор TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Встановлення TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Вийти"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Назад"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Вперед >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -100,12 +98,12 @@ msgstr ""
 "\n"
 "Цей майстер проведе вас через усю установку."
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
-msgstr "Рекомендується вимкнути антивірусний сканер під час установки."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
@@ -113,79 +111,77 @@ msgstr ""
 "Для додаткових налаштувань установки, будь ласка, зверніться\n"
 "на веб-сторінки або у посібники по установці."
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr "Або скористайтеся install-tl-advanced.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr "Чи вкажіть  --gui expert  для install-tl."
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Змінити типове сховище"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Сховище з командного рядка"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "ЛОКАЛЬНІ СХОВИЩА"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "МЕРЕЖНІ СХОВИЩА"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "ТИПОВЕ ВІДДАЛЕНЕ СХОВИЩЕ"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Вибрати сховище"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Дзеркало:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Континент"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Країни"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Дзеркала"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "Почекайте, поки база даних сховищ завантажиться."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Це займе деякий час!"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -204,17 +200,17 @@ msgstr "Це займе деякий час!"
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Неможливо завантажити віддалену базу даних  TeX Live:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Будь ласка, перейдіть назад та виберіть інше дзеркало."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -227,23 +223,24 @@ msgstr ""
 "     локальна: %s\n"
 "у сховищі: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Цільовий каталог:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -259,7 +256,7 @@ msgstr "Цільовий каталог:"
 msgid "Change"
 msgstr "Змінити"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -267,33 +264,32 @@ msgstr ""
 "Цільовий каталог буде  містити установку.\n"
 "Наполегливо рекомендується залишити рік, як останню компоненту."
 
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "потрібний простір на диску:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 "(нема доступу або нема дозволу на запис у типовий каталог - змініть його!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Ввести шлях для"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -321,11 +317,11 @@ msgstr "Ввести шлях для"
 msgid "Ok"
 msgstr "Гаразд"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "Цей екран дозволяє вам налаштувати деякі параметри"
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -338,145 +334,88 @@ msgstr ""
 "Якщо ви хочете щось змінити, натисніть кнопку „Назад“,\n"
 "інакше натисніть кнопку \"Встановити\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Так"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Ні"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Встановити"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Перегляньте %s/index.html за посиланнями на документацію.\n"
-"Веб-сайт TeX Live (http://tug.org/texlive/) містить усі оновлення та  "
-"виправлення. TeX Live - це спільний проект груп користувачів TeX'у  з усього "
-"світу; будь ласка, підтримайте проект, приєднавшись до найкращої для вас "
-"групи. Список груп доступний на веб-сайті http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-"Додайте %s/texmf-dist/doc/man у MANPATH.\n"
-"Додайте %s/texmf-dist/doc/info у INFOPATH.\n"
-"І, найголовніше, додайте %s/bin/%s\n"
-"до вашого PATH для поточної та майбутній сесій."
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"У процесі установки було декілька попереджень.\n"
-"Ось список цих застерігаючих повідомлень:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Ласкаво просимо до TeX Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Завершити"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Нічого"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Тільки нові"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Усі"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Завантажити"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -488,11 +427,11 @@ msgstr "Завантажити"
 msgid "Warning"
 msgstr "Попередження"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Будь ласка, виберіть інше дзеркало."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -507,31 +446,31 @@ msgstr ""
 "  у сховищі: %s\n"
 "Будь ласка, виберіть інше дзеркало."
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Основна інформація"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Програми для систем(и)"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Вибрана схема"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Додаткові налаштування"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr "Збірки для установки"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Установки каталогів"
 
@@ -539,17 +478,16 @@ msgstr "Установки каталогів"
 msgid "Portable setup"
 msgstr "Портована версія"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -558,68 +496,77 @@ msgstr "Портована версія"
 msgid "Toggle"
 msgstr "Перемкнути"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (основний каталог TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (каталог для локальних файлів під сайти)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (каталог для автоматично створюваних даних)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (каталог для локальних налаштувань)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (каталог для власних файлів користувача)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Параметри"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Дозволити виконання обмеженого списку програм через \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Створити усі форматні файли"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Установити дерево документації шрифтів і макросів"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Установити дерево вихідних кодів шрифтів і макросів"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "Створити символічні посилання у системних каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr "Після встановлення отримуйте оновлення пакунків із CTAN"
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "Про"
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Встановити TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr "Продовжити"
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
@@ -627,7 +574,7 @@ msgstr ""
 "Програма установки запущена без адміністративних прав;\n"
 "тому установка можлива лише для поточного користувача."
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 msgid ""
 "Right-click install-tl-advanced and select \"run as administrator\"\n"
 " if you want to install for all users."
@@ -636,88 +583,79 @@ msgstr ""
 "миші\n"
 " на install-tl-advanced та виберіть \"запустити як адміністратор\""
 
-#: tlpkg/installer/install-menu-perltk.pl:589
-msgid "Continue"
-msgstr "Продовжити"
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Процес установки"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Змінити значення змінної"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Введіть шлях для %s (використовуйте ~ для %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "власний вибір збірок"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Виберіть збірки для встановлення"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Вибрати усі"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Зняти виділення"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "створити символічні посилання у стандартних каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "програми у"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "сторінки man у"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "сторінки info у "
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Виберіть архітектуру ОС"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr "Вилучення основної платформи неможливе!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s із %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s збірки(ок) із %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(будь ласка, спершу змініть TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(немає прав на запис у типовий каталог - змініть це!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1623,6 +1561,51 @@ msgstr "Додаткові програми лише під Windows"
 msgid "XeTeX and packages"
 msgstr "XeTeX та пакунки"
 
+#~ msgid "Best to disable your virus scanner during installation."
+#~ msgstr "Рекомендується вимкнути антивірусний сканер під час установки."
+
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Перегляньте %s/index.html за посиланнями на документацію.\n"
+#~ "Веб-сайт TeX Live (http://tug.org/texlive/) містить усі оновлення та  "
+#~ "виправлення. TeX Live - це спільний проект груп користувачів TeX'у  з "
+#~ "усього світу; будь ласка, підтримайте проект, приєднавшись до найкращої "
+#~ "для вас групи. Список груп доступний на веб-сайті http://tug.org/"
+#~ "usergroups.html."
+
+#~ msgid ""
+#~ "Add %s/texmf-dist/doc/man to MANPATH.\n"
+#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n"
+#~ "Most importantly, add %s/bin/%s\n"
+#~ "to your PATH for current and future sessions."
+#~ msgstr ""
+#~ "Додайте %s/texmf-dist/doc/man у MANPATH.\n"
+#~ "Додайте %s/texmf-dist/doc/info у INFOPATH.\n"
+#~ "І, найголовніше, додайте %s/bin/%s\n"
+#~ "до вашого PATH для поточної та майбутній сесій."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "У процесі установки було декілька попереджень.\n"
+#~ "Ось список цих застерігаючих повідомлень:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Ласкаво просимо до TeX Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Завершити"
+
+#~ msgid "Installation process"
+#~ msgstr "Процес установки"
+
 #~ msgid "Mathematics packages"
 #~ msgstr "Математичні пакунки"
 
diff --git a/Master/tlpkg/translations/vi.po b/Master/tlpkg/translations/vi.po
index 14b2fe613f4..4168d1c2a66 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+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"
@@ -16,19 +16,17 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 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:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 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:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -36,55 +34,55 @@ 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:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 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:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 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:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "Cài đặt trình soạn thảo TeXworks"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Cài đặt TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "Thoát"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< Quay lại"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "Tiếp theo >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -93,90 +91,88 @@ msgid ""
 "This wizard will guide you through the installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr "Thay đổi nguồn mặc định"
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr "Nguồn bằng dòng lệnh"
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr "NGUỒN TRÊN MÁY"
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr "NGUỒN TỪ MẠNG"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "Nguồn cài đặt mặc định từ internet"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr "Chọn nguồn"
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr "Mirror:"
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr "Lục địa"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr "Nước"
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr "Mirros"
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr "Vui lòng chờ trong khi dữ liệu nguồn được nạp."
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr "Sẽ tốn ít thời gian!"
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -195,17 +191,17 @@ msgstr "Sẽ tốn ít thời gian!"
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr "Không thể nạp dữ liệu TeX Live từ mạng:"
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr "Vui lòng quay lại và chọn mirro khác."
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -218,23 +214,24 @@ msgstr ""
 "      trên máy: %s\n"
 "nguồn cài đặt: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "Cài đặt vào thư mục:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -250,7 +247,7 @@ msgstr "Cài đặt vào thư mục:"
 msgid "Change"
 msgstr "Thay đổi"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -259,32 +256,31 @@ 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:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 msgid "disk space required:"
 msgstr "dung lượng đĩa cần thiết:"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 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:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "Nhập đường dẫn cho"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -312,11 +308,11 @@ msgstr "Nhập đường dẫn cho"
 msgid "Ok"
 msgstr "Đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 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:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -329,142 +325,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:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "Đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "Không đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "Cài đặt"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"Xem %s/index.html để biết liên kết đến tài liệu.\n"
-"Tại trang web của TeX Live (http://tug.org/texlive/) có các thông tin cập "
-"nhật và sửa lỗi. Dự án TeX Live là có sự tham gia của nhiều nhóm người dùng "
-"TeX trên khắp thế giới; vui lòng hỗ trợ dự án bằng cách tham gia vào nhóm "
-"thích hợp nhất với bạn. Danh sách các nhóm người dùng có thể tìm thấy tại "
-"http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-"Xảy ra lỗi trong quá trình cài đặt.\n"
-"Dưới đây là danh sách các thông báo:"
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "Chào mừng đến với TeX Live!"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "Kết thúc"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "Không"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "Chỉ cái mới"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "Tất cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "thư"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "Nạp"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -476,11 +418,11 @@ msgstr "Nạp"
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr "Vui lòng chọn mirror khác."
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -494,31 +436,31 @@ 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:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "Thông tin cơ bản"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "Hệ thống nhị phân"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "Nhóm đã chọn"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "Tùy chỉnh khác"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "Thiết lập thư mục"
 
@@ -526,17 +468,16 @@ msgstr "Thiết lập thư mục"
 msgid "Portable setup"
 msgstr "Cài đặt linh hoạt (có thể dùng ở máy khác)"
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -545,165 +486,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:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (thư mục TeX chính)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 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:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 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:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 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:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 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:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 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:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "Tạo mọi tập tin định dạng (TeX format)"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "Cài đặt tài liệu cho font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "Cài đặt mã nguồn của font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 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:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: 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:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "Cài đặt TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 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:589
-msgid "Continue"
-msgstr ""
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "Tiến trình cài đặt"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "Đổi giá trị biến"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, 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:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr "tự chọn các nhóm"
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "Chọn nhóm sẽ được cài đặt"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "Chọn tất cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "Không chọn gì cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 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:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "tập tin thi hành vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "tập tin hướng dẫn (man) vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "tập tin hướng dẫn (info) vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "Chọn kiểu hệ thống"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: 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:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s trên %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s nhóm trong tổng số %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(vui lòng đổi thư mục TEXDIR trước!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(mặc định không ghi được - vui lòng đổi!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1607,6 +1548,37 @@ msgstr ""
 msgid "XeTeX and packages"
 msgstr ""
 
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "Xem %s/index.html để biết liên kết đến tài liệu.\n"
+#~ "Tại trang web của TeX Live (http://tug.org/texlive/) có các thông tin cập "
+#~ "nhật và sửa lỗi. Dự án TeX Live là có sự tham gia của nhiều nhóm người "
+#~ "dùng TeX trên khắp thế giới; vui lòng hỗ trợ dự án bằng cách tham gia vào "
+#~ "nhóm thích hợp nhất với bạn. Danh sách các nhóm người dùng có thể tìm "
+#~ "thấy tại http://tug.org/usergroups.html."
+
+#~ msgid ""
+#~ "There were some warnings during the installation process.\n"
+#~ "Here is the list of warning messages:"
+#~ msgstr ""
+#~ "Xảy ra lỗi trong quá trình cài đặt.\n"
+#~ "Dưới đây là danh sách các thông báo:"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "Chào mừng đến với TeX Live!"
+
+#~ msgid "Finish"
+#~ msgstr "Kết thúc"
+
+#~ msgid "Installation process"
+#~ msgstr "Tiến trình cài đặt"
+
 #~ msgid "TeXworks editor"
 #~ msgstr "Trình soạn thảo TeXworks"
 
diff --git a/Master/tlpkg/translations/zh_CN.po b/Master/tlpkg/translations/zh_CN.po
index 2b061e47ca5..789ff8fba5d 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+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"
@@ -13,20 +13,18 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 #, fuzzy
 msgid "Default paper size"
 msgstr "缺省的纸张给"
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -34,55 +32,55 @@ msgid "Change file associations"
 msgstr "修改文件关联"
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 msgid "Adjust PATH setting in registry"
 msgstr "修改注册表中的 PATH 设置"
 
 #: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 msgid "Installation for all users"
 msgstr "为所有用户安装"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 msgid "Install TeXworks front end"
 msgstr "安装 TeXworks 前端"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s 安装"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "退出"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr "< 上一步"
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr "下一步 >"
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -91,90 +89,88 @@ msgid ""
 "This wizard will guide you through the installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr "缺省的网络软件包仓库"
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -193,17 +189,17 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -212,23 +208,24 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr "目的文件夹:"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -244,7 +241,7 @@ msgstr "目的文件夹:"
 msgid "Change"
 msgstr "修改"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -252,33 +249,32 @@ msgstr ""
 "将包含整个安装的目的文件夹。\n"
 "强烈建议以年份作为最后的目录项。"
 
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 #, fuzzy
 msgid "disk space required:"
 msgstr "需要的磁盘空间"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "输入路径变量"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -306,11 +302,11 @@ msgstr "输入路径变量"
 msgid "Ok"
 msgstr "确定"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr "这个界面允许你配置某些选项"
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -322,139 +318,88 @@ msgstr ""
 "将使用下列选项。\n"
 "如果你还想修改什么请后退，否则点击“安装”按钮。"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "是"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 msgid "Install"
 msgstr "安装"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"请参考 %s/index.html 来获得文档链接。TeX Live 官方网站\n"
-"(http://tug.org/texlive/) 包含所有相关的更新和修正。\n"
-"TeX Live 是全世界 TeX 用户组的一个合作项目；\n"
-"请考虑加入合适的 TeX 用户组来支持该项目。从\n"
-"http://tug.org/usergroups.html 可以获得 TeX 用户组的列表。"
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "欢迎进入 TeX Live 的世界！"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "完成"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 msgid "None"
 msgstr "无"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr "只有新的"
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr "全部的"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr "载入"
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -466,11 +411,11 @@ msgstr "载入"
 msgid "Warning"
 msgstr "警告"
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -480,31 +425,31 @@ msgid ""
 "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "基本信息"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "二进制系统"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "选择安装方案"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "进一步定制"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "目录设置"
 
@@ -512,17 +457,16 @@ msgstr "目录设置"
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -531,162 +475,162 @@ msgstr ""
 msgid "Toggle"
 msgstr "切换"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (主 TeX 目录)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (存放本地格式文件等)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (存放自动生成数据的目录)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (存放本地配置)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (用户专有文件的目录)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "选项"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "允许用 \\write18 执行一部分在限制列表内的程序"
 
-#: tlpkg/installer/install-menu-perltk.pl:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "创建所有格式文件"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "安装字体/宏包文档目录树"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "安装字体/宏包源码目录树"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "创建指向系统目录的符号链接"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr "关于"
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 msgid "Install TeX Live"
 msgstr "安装 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 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:589
-msgid "Continue"
-msgstr ""
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-msgid "Installation process"
-msgstr "安装过程"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "更改变量的值"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "输入 %s 对应的路径 (使用 ~ 作为 %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "选择要安装的组件"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "全部选择"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "取消全部选择"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "在标准位置创建符号链接"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "程序文件安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "手册文档(*.man)安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "超文本文档(*.info)安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "选择系统架构"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 #, fuzzy
 msgid "Removals of the main platform not possible!"
 msgstr "不可能删除主架构文件！"
 
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s  来自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s 集合来自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(请首先改变 TEXDIR ！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(默认位置不可写 - 请做相应更改！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1587,6 +1531,29 @@ msgid "XeTeX and packages"
 msgstr ""
 
 #~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "请参考 %s/index.html 来获得文档链接。TeX Live 官方网站\n"
+#~ "(http://tug.org/texlive/) 包含所有相关的更新和修正。\n"
+#~ "TeX Live 是全世界 TeX 用户组的一个合作项目；\n"
+#~ "请考虑加入合适的 TeX 用户组来支持该项目。从\n"
+#~ "http://tug.org/usergroups.html 可以获得 TeX 用户组的列表。"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "欢迎进入 TeX Live 的世界！"
+
+#~ msgid "Finish"
+#~ msgstr "完成"
+
+#~ msgid "Installation process"
+#~ msgstr "安装过程"
+
+#~ msgid ""
 #~ "You don't have permissions to change the installation in any way,\n"
 #~ "specifically, the directory %s is not writable.\n"
 #~ "Please run this program as administrator, or contact your local admin.\n"
diff --git a/Master/tlpkg/translations/zh_TW.po b/Master/tlpkg/translations/zh_TW.po
index 1affd2292ad..eaf3d95f3e8 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: 2016-11-25 21:17+0100\n"
+"POT-Creation-Date: 2017-04-16 02:06+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"
@@ -13,19 +13,17 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: tlpkg/installer/install-menu-wizard.pl:40
-#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:458
 msgid "Default paper size"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:41
-#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:543
 msgid "Add menu shortcuts"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:42
-#: tlpkg/installer/install-menu-perltk.pl:469
-#: tlpkg/installer/install-menu-perltk.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:556
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1245
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1823
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1827
@@ -33,57 +31,57 @@ msgid "Change file associations"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:43
-#: tlpkg/installer/install-menu-perltk.pl:450
+#: tlpkg/installer/install-menu-perltk.pl:524
 msgid "Adjust PATH setting in registry"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:44
-#: tlpkg/installer/install-menu-perltk.pl:476
+#: tlpkg/installer/install-menu-perltk.pl:569
 #, fuzzy
 msgid "Installation for all users"
 msgstr "安裝 TeX Live"
 
 #: tlpkg/installer/install-menu-wizard.pl:45
-#: tlpkg/installer/install-menu-perltk.pl:483
+#: tlpkg/installer/install-menu-perltk.pl:582
 #, fuzzy
 msgid "Install TeXworks front end"
 msgstr "安裝字體/巨集包文檔目錄樹"
 
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-perltk.pl:245
-#: tlpkg/installer/install-menu-perltk.pl:575
+#: tlpkg/installer/install-menu-wizard.pl:136
+#: tlpkg/installer/install-menu-perltk.pl:221
+#: tlpkg/installer/install-menu-perltk.pl:701
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s 安裝"
 
-#: tlpkg/installer/install-menu-wizard.pl:183
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:151
+#: tlpkg/installer/install-menu-perltk.pl:643
+#: tlpkg/installer/install-menu-perltk.pl:689
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544
 msgid "Quit"
 msgstr "退出"
 
-#: tlpkg/installer/install-menu-wizard.pl:185
-#: tlpkg/installer/install-menu-wizard.pl:300
-#: tlpkg/installer/install-menu-wizard.pl:369
-#: tlpkg/installer/install-menu-wizard.pl:421
-#: tlpkg/installer/install-menu-wizard.pl:428
-#: tlpkg/installer/install-menu-wizard.pl:506
-#: tlpkg/installer/install-menu-wizard.pl:615
-#: tlpkg/installer/install-menu-wizard.pl:660
+#: tlpkg/installer/install-menu-wizard.pl:153
+#: tlpkg/installer/install-menu-wizard.pl:268
+#: 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
 msgid "< Back"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:186
-#: tlpkg/installer/install-menu-wizard.pl:230
-#: tlpkg/installer/install-menu-wizard.pl:301
-#: tlpkg/installer/install-menu-wizard.pl:370
-#: tlpkg/installer/install-menu-wizard.pl:507
-#: tlpkg/installer/install-menu-wizard.pl:616
+#: tlpkg/installer/install-menu-wizard.pl:154
+#: 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
 msgid "Next >"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:208
+#: tlpkg/installer/install-menu-wizard.pl:176
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -92,90 +90,88 @@ msgid ""
 "This wizard will guide you through the installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:576
-msgid "Best to disable your virus scanner during installation."
+#: tlpkg/installer/install-menu-wizard.pl:177
+msgid ""
+"In case of trouble, try to disable your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:211
+#: tlpkg/installer/install-menu-wizard.pl:179
 msgid ""
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:214
+#: tlpkg/installer/install-menu-wizard.pl:182
 msgid "Or use install-tl-advanced.bat."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:215
+#: tlpkg/installer/install-menu-wizard.pl:183
 msgid "Or specify  --gui expert  to install-tl."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:224
+#: tlpkg/installer/install-menu-wizard.pl:192
 msgid "Change default repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:261
-#: tlpkg/installer/install-menu-perltk.pl:258
+#: tlpkg/installer/install-menu-wizard.pl:229
+#: tlpkg/installer/install-menu-perltk.pl:235
 msgid "Command line repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:267
-#: tlpkg/installer/install-menu-perltk.pl:264
+#: tlpkg/installer/install-menu-wizard.pl:235
+#: tlpkg/installer/install-menu-perltk.pl:241
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:271
-#: tlpkg/installer/install-menu-perltk.pl:268
+#: tlpkg/installer/install-menu-wizard.pl:239
+#: tlpkg/installer/install-menu-perltk.pl:245
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:269
+#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-perltk.pl:247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1479
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1511
 msgid "Default remote repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:278
-#: tlpkg/installer/install-menu-perltk.pl:273
+#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:252
 msgid "Select repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:280
+#: tlpkg/installer/install-menu-wizard.pl:248
 msgid "Mirror:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:332
+#: tlpkg/installer/install-menu-wizard.pl:300
 msgid "Continent"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:346
+#: tlpkg/installer/install-menu-wizard.pl:314
 msgid "Countries"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:364
+#: tlpkg/installer/install-menu-wizard.pl:332
 msgid "Mirrors"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:411
+#: tlpkg/installer/install-menu-wizard.pl:379
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:380
 msgid "This will take some time!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:415
-#: tlpkg/installer/install-menu-wizard.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:612
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:728
-#: tlpkg/installer/install-menu-perltk.pl:766
-#: tlpkg/installer/install-menu-perltk.pl:810
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:964
+#: tlpkg/installer/install-menu-wizard.pl:383
+#: tlpkg/installer/install-menu-wizard.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:771
+#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:864
+#: tlpkg/installer/install-menu-perltk.pl:935
+#: tlpkg/installer/install-menu-perltk.pl:1000
+#: tlpkg/installer/install-menu-perltk.pl:1034
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:630
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1052
@@ -194,17 +190,17 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-#: tlpkg/installer/install-menu-wizard.pl:419
-#: tlpkg/installer/install-menu-perltk.pl:299
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:283
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:420
-#: tlpkg/installer/install-menu-wizard.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:388
+#: tlpkg/installer/install-menu-wizard.pl:395
 msgid "Please go back and select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -213,23 +209,24 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:456
-#: tlpkg/installer/install-menu-wizard.pl:641
+#: tlpkg/installer/install-menu-wizard.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:609
 msgid "Destination folder:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:458
-#: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:352
-#: tlpkg/installer/install-menu-perltk.pl:374
-#: tlpkg/installer/install-menu-perltk.pl:376
-#: tlpkg/installer/install-menu-perltk.pl:385
-#: tlpkg/installer/install-menu-perltk.pl:392
-#: tlpkg/installer/install-menu-perltk.pl:399
-#: tlpkg/installer/install-menu-perltk.pl:406
-#: tlpkg/installer/install-menu-perltk.pl:455
-#: tlpkg/installer/install-menu-perltk.pl:471
+#: tlpkg/installer/install-menu-wizard.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:323
+#: tlpkg/installer/install-menu-perltk.pl:335
+#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:382
+#: tlpkg/installer/install-menu-perltk.pl:386
+#: tlpkg/installer/install-menu-perltk.pl:402
+#: tlpkg/installer/install-menu-perltk.pl:415
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:440
+#: tlpkg/installer/install-menu-perltk.pl:532
+#: tlpkg/installer/install-menu-perltk.pl:548
+#: tlpkg/installer/install-menu-perltk.pl:561
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1150
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1188
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1196
@@ -245,39 +242,38 @@ msgstr ""
 msgid "Change"
 msgstr "改變"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
+#: tlpkg/installer/install-menu-wizard.pl:448
 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:502
-#: tlpkg/installer/install-menu-perltk.pl:1018
+#: tlpkg/installer/install-menu-wizard.pl:470
+#: tlpkg/installer/install-menu-perltk.pl:1093
 #, fuzzy
 msgid "disk space required:"
 msgstr "需要的磁碟空間"
 
-#: tlpkg/installer/install-menu-wizard.pl:522
-#: tlpkg/installer/install-menu-perltk.pl:1025
+#: tlpkg/installer/install-menu-wizard.pl:490
+#: tlpkg/installer/install-menu-perltk.pl:1104
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:532
+#: tlpkg/installer/install-menu-wizard.pl:500
 msgid "Enter path for"
 msgstr "輸入路徑變數"
 
-#: tlpkg/installer/install-menu-wizard.pl:536
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:310
-#: tlpkg/installer/install-menu-perltk.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:695
-#: tlpkg/installer/install-menu-perltk.pl:726
-#: tlpkg/installer/install-menu-perltk.pl:751
-#: tlpkg/installer/install-menu-perltk.pl:808
-#: tlpkg/installer/install-menu-perltk.pl:853
-#: tlpkg/installer/install-menu-perltk.pl:931
-#: tlpkg/installer/install-menu-perltk.pl:962
-#: tlpkg/installer/install-menu-perltk.pl:979
+#: tlpkg/installer/install-menu-wizard.pl:504
+#: tlpkg/installer/install-menu-perltk.pl:286
+#: tlpkg/installer/install-menu-perltk.pl:297
+#: tlpkg/installer/install-menu-perltk.pl:623
+#: tlpkg/installer/install-menu-perltk.pl:765
+#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:860
+#: tlpkg/installer/install-menu-perltk.pl:918
+#: tlpkg/installer/install-menu-perltk.pl:998
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1051
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:235
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:629
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:633
@@ -305,11 +301,11 @@ msgstr "輸入路徑變數"
 msgid "Ok"
 msgstr "確定"
 
-#: tlpkg/installer/install-menu-wizard.pl:588
+#: tlpkg/installer/install-menu-wizard.pl:556
 msgid "This screen allows you to configure some options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:633
+#: tlpkg/installer/install-menu-wizard.pl:601
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -318,141 +314,90 @@ msgid ""
 "otherwise press the \"Install\" button."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1152
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:69
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
+#: tlpkg/installer/install-menu-perltk.pl:1162
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "Yes"
 msgstr "是"
 
-#: tlpkg/installer/install-menu-wizard.pl:649
-#: tlpkg/installer/install-menu-perltk.pl:120
-#: tlpkg/installer/install-menu-perltk.pl:122
-#: tlpkg/installer/install-menu-perltk.pl:123
-#: tlpkg/installer/install-menu-perltk.pl:124
-#: tlpkg/installer/install-menu-perltk.pl:125
-#: tlpkg/installer/install-menu-perltk.pl:127
-#: tlpkg/installer/install-menu-perltk.pl:128
-#: tlpkg/installer/install-menu-perltk.pl:129
-#: tlpkg/installer/install-menu-perltk.pl:130
-#: tlpkg/installer/install-menu-perltk.pl:131
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1061
-#: tlpkg/installer/install-menu-perltk.pl:1062
-#: tlpkg/installer/install-menu-perltk.pl:1068
-#: tlpkg/installer/install-menu-perltk.pl:1074
-#: tlpkg/installer/install-menu-perltk.pl:1142
-#: tlpkg/installer/install-menu-perltk.pl:1161
+#: tlpkg/installer/install-menu-wizard.pl:617
+#: tlpkg/installer/install-menu-perltk.pl:68
+#: tlpkg/installer/install-menu-perltk.pl:1154
+#: tlpkg/installer/install-menu-perltk.pl:1155
+#: tlpkg/installer/install-menu-perltk.pl:1156
 #: tlpkg/installer/install-menu-perltk.pl:1162
-#: tlpkg/installer/install-menu-perltk.pl:1164
-#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1168
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1257
+#: tlpkg/installer/install-menu-perltk.pl:1258
+#: tlpkg/installer/install-menu-perltk.pl:1260
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:700
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1109
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1725
 msgid "No"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-wizard.pl:658
+#: tlpkg/installer/install-menu-wizard.pl:626
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456
 #, fuzzy
 msgid "Install"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-wizard.pl:713
-#: tlpkg/installer/install-menu-perltk.pl:620
-#, perl-format
-msgid ""
-"See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
-"corrections. TeX Live is a joint project of the TeX user groups around the "
-"world; please consider supporting it by joining the group best for you. The "
-"list of groups is available on the web at http://tug.org/usergroups.html."
-msgstr ""
-"請參考 %s/index.html 來獲得文檔鏈結。TeX Live 官方網站\n"
-"(http://tug.org/texlive/) 包含所有相關的更新和修正。\n"
-"TeX Live 是全世界TeX用戶組的一個合作專案 ；\n"
-"請考慮加入合適的TeX用戶組來支持該項目。從\n"
-"http://tug.org/usergroups.html 可以獲得TeX用戶組的列表。"
-
-#: tlpkg/installer/install-menu-wizard.pl:715
-#: tlpkg/installer/install-menu-perltk.pl:622
-#, perl-format
-msgid ""
-"Add %s/texmf-dist/doc/man to MANPATH.\n"
-"Add %s/texmf-dist/doc/info to INFOPATH.\n"
-"Most importantly, add %s/bin/%s\n"
-"to your PATH for current and future sessions."
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:625
-msgid ""
-"There were some warnings during the installation process.\n"
-"Here is the list of warning messages:"
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:722
-#: tlpkg/installer/install-menu-perltk.pl:630
-msgid "Welcome to TeX Live!"
-msgstr "歡迎進入 TeX Live 的世界！"
-
-#: tlpkg/installer/install-menu-wizard.pl:732
-#: tlpkg/installer/install-menu-perltk.pl:640
-msgid "Finish"
-msgstr "完成"
-
-#: tlpkg/installer/install-menu-perltk.pl:55
-#: tlpkg/installer/install-menu-perltk.pl:1163
+#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:1259
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:143
 #, fuzzy
 msgid "None"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144
 msgid "Only new"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:57
+#: tlpkg/installer/install-menu-perltk.pl:58
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145
 msgid "All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:60
+#: tlpkg/installer/install-menu-perltk.pl:61
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1353
 msgid "letter"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:63
+msgid "No shortcuts"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:64
+msgid "TeX Live menu"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:65
+msgid "Launcher entry"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:276
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2564
 msgid "Load"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:298
-#: tlpkg/installer/install-menu-perltk.pl:305
-#: tlpkg/installer/install-menu-perltk.pl:977
-#: tlpkg/installer/install-menu-perltk.pl:1171
+#: tlpkg/installer/install-menu-perltk.pl:282
+#: tlpkg/installer/install-menu-perltk.pl:290
+#: tlpkg/installer/install-menu-perltk.pl:1049
+#: tlpkg/installer/install-menu-perltk.pl:1267
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:233
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1062
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1655
@@ -464,11 +409,11 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:301
+#: tlpkg/installer/install-menu-perltk.pl:285
 msgid "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:306
+#: tlpkg/installer/install-menu-perltk.pl:292
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation and the repository being "
@@ -478,31 +423,31 @@ msgid ""
 "Please select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:325
+#: tlpkg/installer/install-menu-perltk.pl:312
 msgid "Basic Information"
 msgstr "基本資訊"
 
-#: tlpkg/installer/install-menu-perltk.pl:330
-#: tlpkg/installer/install-menu-perltk.pl:942
+#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-perltk.pl:1009
 msgid "Binary system(s)"
 msgstr "二進位系統"
 
-#: tlpkg/installer/install-menu-perltk.pl:339
-#: tlpkg/installer/install-menu-perltk.pl:774
-#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:330
+#: tlpkg/installer/install-menu-perltk.pl:822
+#: tlpkg/installer/install-menu-perltk.pl:836
 msgid "Selected scheme"
 msgstr "選擇安裝方案"
 
-#: tlpkg/installer/install-menu-perltk.pl:347
+#: tlpkg/installer/install-menu-perltk.pl:341
 msgid "Further Customization"
 msgstr "進一步定制"
 
-#: tlpkg/installer/install-menu-perltk.pl:351
-#: tlpkg/installer/install-menu-perltk.pl:818
+#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Installation collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:360
 msgid "Directory setup"
 msgstr "目錄設置"
 
@@ -510,17 +455,16 @@ msgstr "目錄設置"
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:366
-#: tlpkg/installer/install-menu-perltk.pl:423
-#: tlpkg/installer/install-menu-perltk.pl:428
-#: tlpkg/installer/install-menu-perltk.pl:433
-#: tlpkg/installer/install-menu-perltk.pl:439
-#: tlpkg/installer/install-menu-perltk.pl:446
-#: tlpkg/installer/install-menu-perltk.pl:457
-#: tlpkg/installer/install-menu-perltk.pl:465
-#: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:493
+#: tlpkg/installer/install-menu-perltk.pl:369
+#: tlpkg/installer/install-menu-perltk.pl:463
+#: tlpkg/installer/install-menu-perltk.pl:477
+#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:503
+#: tlpkg/installer/install-menu-perltk.pl:516
+#: tlpkg/installer/install-menu-perltk.pl:535
+#: tlpkg/installer/install-menu-perltk.pl:574
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:604
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1167
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1174
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181
@@ -529,164 +473,163 @@ msgstr ""
 msgid "Toggle"
 msgstr "切換"
 
-#: tlpkg/installer/install-menu-perltk.pl:370
+#: tlpkg/installer/install-menu-perltk.pl:375
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (主 TeX 目錄)"
 
-#: tlpkg/installer/install-menu-perltk.pl:383
+#: tlpkg/installer/install-menu-perltk.pl:396
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (存放本地格式檔等)"
 
-#: tlpkg/installer/install-menu-perltk.pl:390
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (存放本地配置)"
 
-#: tlpkg/installer/install-menu-perltk.pl:397
+#: tlpkg/installer/install-menu-perltk.pl:422
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (存放本地配置)"
 
-#: tlpkg/installer/install-menu-perltk.pl:404
+#: tlpkg/installer/install-menu-perltk.pl:434
 #, fuzzy
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFLOCAL (存放本地格式檔等)"
 
-#: tlpkg/installer/install-menu-perltk.pl:417
+#: tlpkg/installer/install-menu-perltk.pl:453
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513
 msgid "Options"
 msgstr "選項"
 
-#: tlpkg/installer/install-menu-perltk.pl:426
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:431
+#: tlpkg/installer/install-menu-perltk.pl:486
 msgid "Create all format files"
 msgstr "創建所有格式檔"
 
-#: tlpkg/installer/install-menu-perltk.pl:437
+#: tlpkg/installer/install-menu-perltk.pl:498
 msgid "Install font/macro doc tree"
 msgstr "安裝字體/巨集包文檔目錄樹"
 
-#: tlpkg/installer/install-menu-perltk.pl:444
+#: tlpkg/installer/install-menu-perltk.pl:511
 msgid "Install font/macro source tree"
 msgstr "安裝字體/巨集包源碼目錄樹"
 
-#: tlpkg/installer/install-menu-perltk.pl:451
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:525
+#: tlpkg/installer/install-menu-perltk.pl:975
 msgid "Create symlinks in system directories"
 msgstr "創建指向系統目錄的符號鏈結"
 
-#: tlpkg/installer/install-menu-perltk.pl:491
+#: tlpkg/installer/install-menu-perltk.pl:598
 msgid "After installation, get package updates from CTAN"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:505
-#: tlpkg/installer/install-menu-perltk.pl:507
+#: tlpkg/installer/install-menu-perltk.pl:620
+#: tlpkg/installer/install-menu-perltk.pl:622
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:650
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:652
 msgid "About"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:639
 #, fuzzy
 msgid "Install TeX Live"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:580
+#: tlpkg/installer/install-menu-perltk.pl:689
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:691
+msgid ""
+"In case of trouble, try disabling your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:694
 msgid ""
 "The installer does not have adminstrative permissions;\n"
 "so can only install for current user."
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:583
+#: tlpkg/installer/install-menu-perltk.pl:697
 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:589
-msgid "Continue"
-msgstr ""
-
-#: tlpkg/installer/install-menu-perltk.pl:599
-#: tlpkg/installer/install-menu-perltk.pl:603
-#, fuzzy
-msgid "Installation process"
-msgstr "安裝 TeX Live"
-
-#: tlpkg/installer/install-menu-perltk.pl:681
-#: tlpkg/installer/install-menu-perltk.pl:712
+#: tlpkg/installer/install-menu-perltk.pl:745
+#: tlpkg/installer/install-menu-perltk.pl:788
 msgid "Change variable value"
 msgstr "更改變數的值"
 
-#: tlpkg/installer/install-menu-perltk.pl:684
-#: tlpkg/installer/install-menu-perltk.pl:722
+#: tlpkg/installer/install-menu-perltk.pl:748
+#: tlpkg/installer/install-menu-perltk.pl:798
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "輸入路徑變數 %s (使用 ~ 作為 %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:796
+#: tlpkg/installer/install-menu-perltk.pl:845
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:828
+#: tlpkg/installer/install-menu-perltk.pl:882
 msgid "Select the collections to be installed"
 msgstr "選擇要安裝的組件"
 
-#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:910
 msgid "Select All"
 msgstr "全部選擇"
 
-#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:914
 msgid "Deselect All"
 msgstr "取消全部選擇"
 
-#: tlpkg/installer/install-menu-perltk.pl:912
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "在標準位置創建符號鏈結"
 
-#: tlpkg/installer/install-menu-perltk.pl:917
+#: tlpkg/installer/install-menu-perltk.pl:983
 msgid "binaries to"
 msgstr "程式檔安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "manpages to"
 msgstr "手冊文檔(*.man)安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "info to"
 msgstr "超文本文檔(*.info)安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:951
+#: tlpkg/installer/install-menu-perltk.pl:1018
 msgid "Select arch-os"
 msgstr "選擇系統架構"
 
-#: tlpkg/installer/install-menu-perltk.pl:978
+#: tlpkg/installer/install-menu-perltk.pl:1050
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1063
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1010
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s 來自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1091
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s 集合來自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1034
-#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1119
+#: tlpkg/installer/install-menu-perltk.pl:1137
 msgid "(please change TEXDIR first!)"
 msgstr "(請首先改變 TEXDIR ！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1037
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1124
+#: tlpkg/installer/install-menu-perltk.pl:1142
 msgid "(default not writable - please change!)"
 msgstr "(默認位置不可寫 - 請做相應更改！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1172
+#: tlpkg/installer/install-menu-perltk.pl:1269
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1609,6 +1552,30 @@ msgstr ""
 msgid "XeTeX and packages"
 msgstr ""
 
+#~ msgid ""
+#~ "See %s/index.html for links to documentation.\n"
+#~ "The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+#~ "corrections. TeX Live is a joint project of the TeX user groups around "
+#~ "the world; please consider supporting it by joining the group best for "
+#~ "you. The list of groups is available on the web at http://tug.org/"
+#~ "usergroups.html."
+#~ msgstr ""
+#~ "請參考 %s/index.html 來獲得文檔鏈結。TeX Live 官方網站\n"
+#~ "(http://tug.org/texlive/) 包含所有相關的更新和修正。\n"
+#~ "TeX Live 是全世界TeX用戶組的一個合作專案 ；\n"
+#~ "請考慮加入合適的TeX用戶組來支持該項目。從\n"
+#~ "http://tug.org/usergroups.html 可以獲得TeX用戶組的列表。"
+
+#~ msgid "Welcome to TeX Live!"
+#~ msgstr "歡迎進入 TeX Live 的世界！"
+
+#~ msgid "Finish"
+#~ msgstr "完成"
+
+#, fuzzy
+#~ msgid "Installation process"
+#~ msgstr "安裝 TeX Live"
+
 #~ msgid "Standard collections"
 #~ msgstr "標準安裝"