autoupdate via tl-update-messages

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

17 files changed, 3340 insertions, 2594 deletions

diff --git a/Master/tlpkg/translations/cs.po b/Master/tlpkg/translations/cs.po
index 33bd02f7a9b..421f21e1da0 100644
--- a/Master/tlpkg/translations/cs.po
+++ b/Master/tlpkg/translations/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2009-09-08 11:35+0100\n"
 "Last-Translator: Michal Madr <m.madr@seznam.cz>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -14,33 +14,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalace TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Ukončit"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Předcházející"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Předcházející"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Další >"
 
@@ -52,47 +54,44 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Vítejte v instalaci TeX Live %s\n"
-"http://tug.org/texlive\n"
-"\n"
-"Tento průvodce vám s instalací pomůže.\n"
-"\n"
-"Informace o pokročilé,  konfigurovatelné instalaci\n"
-"je k dispozici na webových stránkách nebo\n"
-"v pokynech k instalaci."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Nebo použijte install-tl-advance.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-#, fuzzy
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Nebo spusťte install-tl s argumentem --gui perltk."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
@@ -100,47 +99,47 @@ msgstr ""
 msgid "Default remote repository"
 msgstr "Výchozí síťový zdroj balíků"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -158,17 +157,17 @@ msgstr ""
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 msgid "Please go back and select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -177,12 +176,12 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Cílová složka:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -210,7 +209,7 @@ msgstr "Cílová složka:"
 msgid "Change"
 msgstr "Změnit"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -218,33 +217,33 @@ 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:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 #, fuzzy
 msgid "disk space required:"
 msgstr "vyžadované místo na disku"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Zadat cestu pro"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -271,42 +270,42 @@ msgstr "Zadat cestu pro"
 msgid "Ok"
 msgstr "OK"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 #, fuzzy
 msgid "Default paper size"
 msgstr "Výchozí papír pro"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Změna asociace typů souborů k programům"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "Upravení settingu PATH v registrech"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Instalace pro všechny uživatele"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 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:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -319,7 +318,7 @@ 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:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -330,20 +329,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Ano"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -354,29 +353,29 @@ msgstr "Ano"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "Ne"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Nainstaluj"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -392,8 +391,8 @@ msgstr ""
 "vyhovuje.\n"
 "Seznam sdružení je dostupný na http://tug.org/usergroups.html."
 
-#: tlpkg/installer/install-menu-wizard.pl:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -406,25 +405,25 @@ msgstr ""
 "A to nejdůležitější: přidejte %s/bin/%s\n"
 "do vaší proměnné PATH pro toto i další sezení."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Vítejte v TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Dokončit"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Žádné"
@@ -454,8 +453,8 @@ msgstr "Nahrát"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -487,13 +486,13 @@ msgid "Basic Information"
 msgstr "Základní informace"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Binární systém(y)"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Vybrané schéma"
 
@@ -502,12 +501,12 @@ msgid "Further Customization"
 msgstr "Další přizpůsobení"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Standardní kolekce"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Jazykové kolekce"
 
@@ -580,7 +579,7 @@ msgid "Install font/macro source tree"
 msgstr "Instalovat zdrojové soubory fontů/maker"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Vytvořit symbolické linky v systémových adresářích"
 
@@ -596,102 +595,122 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "Nainstaluj TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 #, fuzzy
 msgid "Installation process"
 msgstr "Instalace"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Změnit hodnotu proměnné"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, 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:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Vybrat kolekce k nainstalování"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Zrušit výběr všech položek"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Vybrat podporu jazyků"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Vybrat dokumentaci k jednotlivým jazykům"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "vytvořit symbolické linky v standardních adresářích"
 
-#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "binární soubory do"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "manuálové stránky do"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "info soubory do"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Vybrat architekturu a OS"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 #, fuzzy
 msgid "Removals of the main platform not possible!"
 msgstr "Odstranění hlavní architektury není možné!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcí z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(nebyla vybrána žádná jazyková kolekce!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(prosím, změňte nejdříve TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 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:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1762,6 +1781,31 @@ msgid "XeTeX packages"
 msgstr ""
 
 #~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Vítejte v instalaci TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Tento průvodce vám s instalací pomůže.\n"
+#~ "\n"
+#~ "Informace o pokročilé,  konfigurovatelné instalaci\n"
+#~ "je k dispozici na webových stránkách nebo\n"
+#~ "v pokynech k instalaci."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Nebo použijte install-tl-advance.bat"
+
+#, fuzzy
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "Nebo spusťte install-tl s argumentem --gui perltk."
+
+#~ msgid ""
 #~ "Loading local TeX Live Database\n"
 #~ "This may take some time, please wait!"
 #~ msgstr ""
diff --git a/Master/tlpkg/translations/de.po b/Master/tlpkg/translations/de.po
index becb13a4406..eb2e9d57f8b 100644
--- a/Master/tlpkg/translations/de.po
+++ b/Master/tlpkg/translations/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2012-05-29 20:48+0100\n"
 "Last-Translator: Uwe Ziegenhagen <ziegenhagen@gmail.com>\n"
 "Language-Team: TL German Translation Team <tex-live@tug.org>\n"
@@ -15,33 +15,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s Installation"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Beenden"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Zurück"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Zurück"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Nächster >"
 
@@ -53,91 +55,92 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Willkommen zur Installation von TeX Live %s.\n"
-"http://tug.org/texlive\n"
-"\n"
-"Dieser Wizard wird Sie durch die Installation führen."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Oder benutzen Sie die 'install-tl-advanced.bat'"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Oder benutzen Sie den Kommandozeilenschalter '--gui expert' für install-tl."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "Ändern der voreingestellten Installationsquelle"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr "Kommandozeilen-Repository"
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "Lokale Quellen"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "Netzwerkquellen"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Voreingestellte Netzwerkinstallationsquelle"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "Auswahl der  Installationsquelle"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "Spiegelserver:"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "Kontinent"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "Länder"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "Spiegelserver"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr "Bitte warten bis die Installationsdatenbank geladen ist."
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "Dies kann etwas Zeit beanspruchen!"
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
-#: texmf/scripts/texlive/tlmgrgui.pl:611
-#: texmf/scripts/texlive/tlmgrgui.pl:612
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
+#: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
 #: texmf/scripts/texlive/tlmgrgui.pl:1367
@@ -154,17 +157,17 @@ msgstr "Dies kann etwas Zeit beanspruchen!"
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr "Konnte die remote TeX Live Datenbank nicht laden"
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 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:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -177,12 +180,12 @@ msgstr ""
 "  lokal: %s\n"
 "  Installationsquelle:%s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Zielverzeichnis:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -210,7 +213,7 @@ msgstr "Zielverzeichnis:"
 msgid "Change"
 msgstr "Ändern"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -218,38 +221,36 @@ msgstr ""
 "Das Installationsverzeichnis enthält die TeX Live installation.\n"
 "Wie empfehlen das Jahr als letzten Ordner beizubehalten."
 
-#: tlpkg/installer/install-menu-wizard.pl:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "benötigter Festplattenplatz:"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
-msgstr "(Standardverzeichnis nicht zugänglich oder beschreibbar - bitte ändern)"
+msgstr ""
+"(Standardverzeichnis nicht zugänglich oder beschreibbar - bitte ändern)"
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Bitte geben Sie den Pfad ein für"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
-#: texmf/scripts/texlive/tlmgrgui.pl:238
-#: texmf/scripts/texlive/tlmgrgui.pl:611
-#: texmf/scripts/texlive/tlmgrgui.pl:615
-#: texmf/scripts/texlive/tlmgrgui.pl:617
-#: texmf/scripts/texlive/tlmgrgui.pl:635
-#: texmf/scripts/texlive/tlmgrgui.pl:814
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
+#: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
+#: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1416
 #: texmf/scripts/texlive/tlmgrgui.pl:1446
@@ -273,41 +274,41 @@ msgstr "Bitte geben Sie den Pfad ein für"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Standard-Papierformat"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "Füge Menüeinträge hinzu"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Anpassen der Dateiverknüpfungen"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "Ändere die PATH Einstellung in der Registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Installation für alle Benutzer"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr "This screen allows you to configure some options"
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -320,7 +321,7 @@ 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:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -331,20 +332,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Ja"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -355,44 +356,49 @@ msgstr "Ja"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "Nein"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Installation"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and corrections. TeX Live is a joint project of the TeX user groups around the world; please consider supporting it by joining the group best for you. The list of groups is available on the web at http://tug.org/usergroups.html."
+"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+"corrections. TeX Live is a joint project of the TeX user groups around the "
+"world; please consider supporting it by joining the group best for you. The "
+"list of groups is available on the web at http://tug.org/usergroups.html."
 msgstr ""
 "Für Verweise auf Dokumentation sehen 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 der TeX Benutzer Gruppen rund um die Welt;\n"
+"TeX Live ist ein gemeinsames Projekt der TeX Benutzer Gruppen rund um die "
+"Welt;\n"
 "bitte überlegen Sie sich der für sie sinnvollsten Gruppe beizutreten. Die\n"
-"Liste der Gruppen können Sie am Web auf http://tug.org/usergroups.html finden."
+"Liste der Gruppen können Sie am Web auf http://tug.org/usergroups.html "
+"finden."
 
-#: tlpkg/installer/install-menu-wizard.pl:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -405,8 +411,8 @@ msgstr ""
 "Am wichtigsten, fügen Sie %s/bin/%s\n"
 "zu Ihrem PATH für die aktuelle und zukünftige Sitzungen hinzu."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -414,18 +420,18 @@ msgstr ""
 "Es gab Warnungen während der Installation.\n"
 " Hier die Liste der Warnhinweise"
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Willkomen bei TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Ende"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Gar nicht"
@@ -455,8 +461,8 @@ msgstr "Laden"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -476,12 +482,14 @@ msgstr "Bitte einen anderen Spiegelserver wählen!"
 #: tlpkg/installer/install-menu-perltk.pl:309
 #, perl-format
 msgid ""
-"The TeX Live versions of the local installation and the repository being accessed are not compatible:\n"
+"The TeX Live versions of the local installation and the repository being "
+"accessed are not compatible:\n"
 "  local: %s\n"
 "  repository: %s\n"
 "Please select a different mirror."
 msgstr ""
-"DIe TeX Live Versionen der lokalen Installation und der benutzten Installationsquelle stimmen nicht überein:\n"
+"DIe TeX Live Versionen der lokalen Installation und der benutzten "
+"Installationsquelle stimmen nicht überein:\n"
 "  lokal: %s\n"
 "  Installationsquelle: %s\n"
 "Bitte anderen Spiegelserver auswählen."
@@ -491,13 +499,13 @@ msgid "Basic Information"
 msgstr "Grundlegende Informationen"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Binärsysteme"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Ausgewähltes Schema"
 
@@ -506,12 +514,12 @@ msgid "Further Customization"
 msgstr "Weitere Einstellungen"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Paketgruppen der Makro-Pakete"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Paketgruppen der Sprach-Pakete"
 
@@ -584,7 +592,7 @@ msgid "Install font/macro source tree"
 msgstr "Installation der Font/Macro-Quellen"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Symbolische Links in Systemverzeichnissen"
 
@@ -600,100 +608,120 @@ msgstr "Hole nach der Installation Paket-Updates von CTAN"
 msgid "Install TeX Live"
 msgstr "TeX Live installieren"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Installation"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Ändern der Werte von Variablen"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, 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:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "benutzerdefinierte Auswahl der Collections"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Auswahl der zu installierenden Paketgruppen"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Alle anwählen"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Alle abwählen"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Pakete für verschiedene Sprachen"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Dokumentation in verschiedenen Sprachen"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: 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:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "Programme nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "Hilfeseiten (*.man) nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "Infoseiten (*.info) nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Auswahl der Architekturen"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr "Entfernen der Hauptarchitekturen ist nicht möglich!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s von %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s Paketgruppen von %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(keine Sprachkollektion ausgewählt!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(Bitte zuerst TEXDIR ändern!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(Vorgabe ohne Schreibberechtigung - bitte ändern!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -728,7 +756,8 @@ msgid ""
 msgstr ""
 "Sie haben keine Berechtigung die Installation zu verändern,\n"
 "insbesonders ist der Ordner %s nicht schreibbar.\n"
-"Bitte starten Sie dieses Programm als Administrator, oder kontaktieren Sie den lokalen Administrator.\n"
+"Bitte starten Sie dieses Programm als Administrator, oder kontaktieren Sie "
+"den lokalen Administrator.\n"
 "\n"
 "Die meisten Schaltflächen werden deaktiviert."
 
@@ -753,8 +782,7 @@ msgstr "Anzeigeeigenschaften"
 msgid "Status"
 msgstr "Status"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:304
-#: texmf/scripts/texlive/tlmgrgui.pl:358
+#: texmf/scripts/texlive/tlmgrgui.pl:304 texmf/scripts/texlive/tlmgrgui.pl:358
 msgid "all"
 msgstr "Alle"
 
@@ -980,8 +1008,7 @@ msgstr ""
 msgid "Manual"
 msgstr "Dokumentation"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
-#: texmf/scripts/texlive/tlmgrgui.pl:634
+#: texmf/scripts/texlive/tlmgrgui.pl:632 texmf/scripts/texlive/tlmgrgui.pl:634
 msgid "About"
 msgstr "Über TeX Live Manager (tlmgr)"
 
@@ -1048,7 +1075,8 @@ msgstr "Paketgruppe:"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:731
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
-msgstr "Warnung: Die Katalog-Versionen können veraltet oder einfach falsch sein."
+msgstr ""
+"Warnung: Die Katalog-Versionen können veraltet oder einfach falsch sein."
 
 #: texmf/scripts/texlive/tlmgrgui.pl:769
 msgid "Depends:"
@@ -1265,13 +1293,15 @@ msgstr ""
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
-"Please select \"Update all installed\" button after dismissing this dialogue.\n"
+"Please select \"Update all installed\" button after dismissing this "
+"dialogue.\n"
 "\n"
 "The program will terminate after the update.\n"
 "Then you can restart the program for further updates."
 msgstr ""
 "Updates für den tlmgr sind verfügbar.\n"
-"Die Installation von Updates funktioniert nicht ohne Upgrade auf die neue Version.\n"
+"Die Installation von Updates funktioniert nicht ohne Upgrade auf die neue "
+"Version.\n"
 "Bitte wählen Sie \"Update all installed\" nach Beendigung dieses Dialogs.\n"
 "\n"
 "Das Programm wird nach dem Update beendet.\n"
@@ -1280,11 +1310,16 @@ msgstr ""
 #: texmf/scripts/texlive/tlmgrgui.pl:2286
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
-msgstr "Zumindest %s weitere Updates sind verfügbar nachdem tlmgr aktualisiert wurde."
+msgstr ""
+"Zumindest %s weitere Updates sind verfügbar nachdem tlmgr aktualisiert wurde."
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2288
-msgid "Please wait a bit after the program has terminated so that the update can be completed."
-msgstr "Bitte warten Sie etwas nachdem das Programm sich beendet hat, damit die Aktualisierungen durchgeführt werden können."
+msgid ""
+"Please wait a bit after the program has terminated so that the update can be "
+"completed."
+msgstr ""
+"Bitte warten Sie etwas nachdem das Programm sich beendet hat, damit die "
+"Aktualisierungen durchgeführt werden können."
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2368
 #: texmf/scripts/texlive/tlmgrgui.pl:2370
@@ -1293,7 +1328,8 @@ msgstr "Wiederherstellung abgeschlossen"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2375
 msgid "Select the package to restore, or restore all packages"
-msgstr "Auswahl des wiederherzustellenden Pakets, oder alle Pakete wiederherstellen"
+msgstr ""
+"Auswahl des wiederherzustellenden Pakets, oder alle Pakete wiederherstellen"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2391
 msgid "Revision:"
@@ -1706,7 +1742,8 @@ msgstr "PSTricks Pakete"
 
 #: tlpkg/translations/shortdesc.pl:89
 msgid "Support for publishers, theses, standards, conferences, etc."
-msgstr "Unterstützung für Verleger, Abschlussarbeiten, Standards, Konferenzen, etc."
+msgstr ""
+"Unterstützung für Verleger, Abschlussarbeiten, Standards, Konferenzen, etc."
 
 #: tlpkg/translations/shortdesc.pl:90
 msgid "Typesetting for natural and computer sciences"
@@ -1728,6 +1765,28 @@ msgstr "Windows-spezifische Hilfsprogramme"
 msgid "XeTeX packages"
 msgstr "XeTeX Pakete"
 
+#~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Willkommen zur Installation von TeX Live %s.\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Dieser Wizard wird Sie durch die Installation führen."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Oder benutzen Sie die 'install-tl-advanced.bat'"
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr ""
+#~ "Oder benutzen Sie den Kommandozeilenschalter '--gui expert' für install-"
+#~ "tl."
+
 #~ msgid "After install, use tlnet on CTAN for package updates"
 #~ msgstr "Nutze tlnet auf CTAN für Paket-Updates nach der Installation"
 
diff --git a/Master/tlpkg/translations/es.po b/Master/tlpkg/translations/es.po
index 269e79b9e08..ff3ef172117 100644
--- a/Master/tlpkg/translations/es.po
+++ b/Master/tlpkg/translations/es.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+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"
@@ -16,33 +16,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalación de TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Salir"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Atrás"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Atrás"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Siguiente >"
 
@@ -54,92 +56,91 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Bienvenido a la instalaciónde Tex Live %s\n"
-"http://tug.org/texlive\n"
-"\n"
-"Este instalador le guiará durante el proceso.\n"
-"\n"
-"Para una instalación personalizada o avanzada, por favor consulte\n"
-"las páginas web o la guía de instalación."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "También puede usar el ejecutable install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Repositorio de paquetes por defecto"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -157,17 +158,17 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 msgid "Please go back and select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -176,12 +177,12 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Ruta de instalación:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -209,7 +210,7 @@ msgstr "Ruta de instalación:"
 msgid "Change"
 msgstr "Cambiar"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -218,32 +219,32 @@ 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:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Introduzca la ruta para"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -270,41 +271,41 @@ msgstr "Introduzca la ruta para"
 msgid "Ok"
 msgstr "Aceptar"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Cambiar asociaciones de archivos"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "Configurar la variable PATH en el registro"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Instalación para todos los usuarios"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr "Esta pantalla le permite configurar ciertas opciones"
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -317,7 +318,7 @@ msgstr ""
 "Si quiere cambiar algo, vuelva atrás,\n"
 "o si quiere continuar presione el botón \"Instalar\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -328,20 +329,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Sí"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -352,29 +353,29 @@ msgstr "Sí"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "No"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Instalar"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -390,8 +391,8 @@ msgstr ""
 "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:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -404,25 +405,25 @@ msgstr ""
 "Y en especial,añada %s/bin/%s\n"
 "a su ruta (PATH) para sus sesiones actual y futuras."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "¡Bienvenido a Tex Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Terminar"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Ninguna"
@@ -452,8 +453,8 @@ msgstr "Cargar"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -485,13 +486,13 @@ msgid "Basic Information"
 msgstr "Información básica"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Arquitectura seleccionada"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Esquema seleccionado"
 
@@ -500,12 +501,12 @@ msgid "Further Customization"
 msgstr "Personalización avanzada"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Colecciones estándar"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Colecciones de idiomas"
 
@@ -578,7 +579,7 @@ msgid "Install font/macro source tree"
 msgstr "Instalar las fuentes de tipos de letra y macros"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Crear enlaces simbólicos en los  directorios de sistema"
 
@@ -594,100 +595,120 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "Instalar Tex Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Proceso de instalación"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Cambiar el valor de la variable"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, 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:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Seleccione las colecciones que se instalarán"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Deseleccionar todo"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Seleccionar el idioma"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Seleccionar el idioma para la documentación"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: 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:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "ficheros ejecutables en"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "páginas de manual en"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "información en"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Seleccionar arquitectura-sistema operativo"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s de %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(¡no se seleccionó ninguna colección de idioma!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(por favor, ¡cambie el TEXDIR primero!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(no se permite la escritura, ¡cambie el directorio por favor!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1718,6 +1739,26 @@ msgid "XeTeX packages"
 msgstr ""
 
 #~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Bienvenido a la instalaciónde Tex Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Este instalador le guiará durante el proceso.\n"
+#~ "\n"
+#~ "Para una instalación personalizada o avanzada, por favor consulte\n"
+#~ "las páginas web o la guía de instalación."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "También puede usar el ejecutable install-tl-advanced.bat"
+
+#~ msgid ""
 #~ "Loading local TeX Live Database\n"
 #~ "This may take some time, please wait!"
 #~ msgstr ""
diff --git a/Master/tlpkg/translations/fr.po b/Master/tlpkg/translations/fr.po
index e5c52b26ce8..7d3ce7b0ab1 100644
--- a/Master/tlpkg/translations/fr.po
+++ b/Master/tlpkg/translations/fr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2012-05-24 12:37+0200\n"
 "Last-Translator: Manuel Pégourié-Gonnard <mpg@elzevir.fr>\n"
 "Language-Team: Français <texlive@tug.org>\n"
@@ -18,33 +18,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Installation de TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Quitter"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Précédent"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Précédent"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Suivant >"
 
@@ -56,96 +58,93 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Bienvenue dans l'installateur de TeX Live %s\n"
-"http://tug.org/texlive\n"
-"\n"
-"Cet installateur « magique » vous guidera pendant la procédure "
-"d'installation.\n"
-"\n"
-"Pour procéder à l'installation en mode avancé et ainsi disposer de plus "
-"d'options,\n"
-"veuillez consulter les pages web ou le guide d'installation."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Ou utiliser install-tl-advanced.bat."
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Ou utiliser l'option « --gui expert » de install-tl."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "Changer de dépôt par défaut"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr "Dépôt indiqué sur la ligne de commande"
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "Dépôts de paquets locaux"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "Dépôts de paquets en ligne"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Dépôt de paquets en ligne par défaut"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "Choisir le dépôt de paquets"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "Mirroir :"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "Continent"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "Pays"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "Mirroirs"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 "Veuillez patientez pendant le chargement de la base de données des dépôts de "
 "paquets."
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "Ceci peut prendre du temps."
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -163,17 +162,17 @@ msgstr "Ceci peut prendre du temps."
 msgid "Cancel"
 msgstr "Annuler"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr "Échec du chargement de la base de données TeX Live :"
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 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:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -186,12 +185,12 @@ msgstr ""
 "installée : %s\n"
 "    dépôt : %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Répertoire de destination :"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -219,7 +218,7 @@ msgstr "Répertoire de destination :"
 msgid "Change"
 msgstr "Modifier"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -227,32 +226,32 @@ 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:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "espace disque nécessaire :"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 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:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Entrer le chemin"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -279,41 +278,41 @@ msgstr "Entrer le chemin"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Taille de papier par défaut"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "Ajouter des raccourcis au menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Modifier les associations de fichiers"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "Modifier le réglage du PATH dans la base de registre"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Installer pour tous les utilisateurs"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 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:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -326,7 +325,7 @@ msgstr ""
 "Si vous souhaitez changer quelque chose, revenez en arrière ;\n"
 "sinon, cliquez sur le bouton « Installer »."
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -337,20 +336,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Oui"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -361,29 +360,29 @@ msgstr "Oui"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "Non"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Installer"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -400,8 +399,8 @@ msgstr ""
 "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:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -414,8 +413,8 @@ msgstr ""
 "mais surtout, ajoutez %s/bin/%s\n"
 " à votre PATH, pour cette session et les prochaines."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -423,18 +422,18 @@ msgstr ""
 "Des avertissements ont été émis durant l'installation.\n"
 "Voici la liste des messages émis :"
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Bienvenue sous TeX Live !"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Terminer"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Aucun"
@@ -464,8 +463,8 @@ msgstr "Charger"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -502,13 +501,13 @@ msgid "Basic Information"
 msgstr "Informations générales"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Plate-forme(s) des binaires"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Schéma sélectionné"
 
@@ -517,12 +516,12 @@ msgid "Further Customization"
 msgstr "Personnalisation avancée"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Collections standards"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Collections de langues"
 
@@ -595,7 +594,7 @@ msgid "Install font/macro source tree"
 msgstr "Installer les sources des macros et polices"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Créer les liens symboliques dans les répertoires systèmes"
 
@@ -611,100 +610,120 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "Installer TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Processus d'installation"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Changer la valeur de la variable"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Entrer le chemin %s (utiliser ~ pour %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "sélection personnalisée de collections"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Choisir les collections à installer"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Tout désélectionner"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Choisir les langues disponibles"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Choisir les langues des documentations multilingues"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: 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:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "Emplacement des binaires"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "Emplacement des pages de man"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "Emplacement des pages info"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Choisir la plate-forme"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 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:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s parmi %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collections parmi %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(aucune collection de langue sélectionnée !)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(changer d'abord TEXDIR !)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(écriture impossible - changer d'emplacement !)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1746,6 +1765,31 @@ msgstr "Programmes de support spécifique pour Windows"
 msgid "XeTeX packages"
 msgstr "Paquet XeTeX"
 
+#~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Bienvenue dans l'installateur de TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Cet installateur « magique » vous guidera pendant la procédure "
+#~ "d'installation.\n"
+#~ "\n"
+#~ "Pour procéder à l'installation en mode avancé et ainsi disposer de plus "
+#~ "d'options,\n"
+#~ "veuillez consulter les pages web ou le guide d'installation."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Ou utiliser install-tl-advanced.bat."
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "Ou utiliser l'option « --gui expert » de install-tl."
+
 #~ msgid "After install, use tlnet on CTAN for package updates"
 #~ msgstr ""
 #~ "Après installation, utiliser tlnet sur le CTAN pour les mises àjours"
diff --git a/Master/tlpkg/translations/it.po b/Master/tlpkg/translations/it.po
index 71f9fd4ada7..250c6b0b5a5 100644
--- a/Master/tlpkg/translations/it.po
+++ b/Master/tlpkg/translations/it.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tex Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2011-06-20 09:49+0100\n"
 "Last-Translator: Marco Pallante <marco.pallante@gmail.com>\n"
 "Language-Team: <>\n"
@@ -14,33 +14,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Installazione di TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Esci"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Indietro"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Indietro"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Avanti >"
 
@@ -52,92 +54,91 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Benvenuti nell'installazione di TeX Live %s\n"
-"http://tug.org/texlive\n"
-"\n"
-"Questo programma vi guiderà attraverso il processo di installazione.\n"
-"\n"
-"Per un'installazione avanzata e personalizzabile, consultate\n"
-"il sito web oppure la guida all'installazione."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "In alternativa, usate il programma install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "In alternativa, usate l'opzione --gui perltk di install-tl."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Archivio di rete predefinito"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -155,17 +156,17 @@ msgstr ""
 msgid "Cancel"
 msgstr "Annulla"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 msgid "Please go back and select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -174,12 +175,12 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Percorso di destinazione:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -207,7 +208,7 @@ msgstr "Percorso di destinazione:"
 msgid "Change"
 msgstr "Cambia"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -216,32 +217,32 @@ msgstr ""
 "Raccomandiamo di lasciare l'anno di questa edizione di TeX Live\n"
 "come ultima componente del percorso."
 
-#: tlpkg/installer/install-menu-wizard.pl:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "spazio necessario sul disco:"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 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:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Inserisci il percorso per"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -268,41 +269,41 @@ msgstr "Inserisci il percorso per"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Formato pagina predefinito"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "Aggiungi le scorciatoie da menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Cambia le associazioni dei file"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "Correggere le impostazioni del PATH nel registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Installazione per tutti gli utenti"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr "Da questa schermata è possibile configurare alcune opzioni"
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -315,7 +316,7 @@ msgstr ""
 "Se desiderate modificare qualcosa prima di procedere, tornate indietro,\n"
 "altrimenti premete sul pulsante \"Installa\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -326,20 +327,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Sì"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -350,29 +351,29 @@ msgstr "Sì"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "No"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Installa"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -389,8 +390,8 @@ msgstr ""
 "La lista dei gruppi è disponibile sul web alla pagina http://tug.org/"
 "usergroups.html."
 
-#: tlpkg/installer/install-menu-wizard.pl:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -404,8 +405,8 @@ msgstr ""
 "in questa sessione ed ai prossimi avvii,\n"
 "aggiungi %s/bin/%s alla tua variabile PATH."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -413,18 +414,18 @@ 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:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Benvenuti a TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Fine"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Nessuno"
@@ -454,8 +455,8 @@ msgstr "Carica"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -487,13 +488,13 @@ msgid "Basic Information"
 msgstr "Informazioni di base"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Architetture selezionate"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Schemi selezionati"
 
@@ -502,12 +503,12 @@ msgid "Further Customization"
 msgstr "Personalizzazioni aggiuntive"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Collezioni di base"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Collezioni di lingue"
 
@@ -581,7 +582,7 @@ msgid "Install font/macro source tree"
 msgstr "Installa i sorgenti per font e macro"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Crea i collegamenti nelle directory di sistema"
 
@@ -597,100 +598,120 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "Installa TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Installazione"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Cambia il valore della variabile"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, 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:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "selezione personalizzata delle collezioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Seleziona le collezioni di pacchetti da installare"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Seleziona Tutto"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Deseleziona Tutto"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Seleziona il supporto per le lingue"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Seleziona la documentazione per le diverse lingue"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: 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:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "eseguibili in"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "pagine di manuale in"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "pagine info in"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Seleziona le combinazioni di architetture e sistemi operativi"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr "Non è possibile rimuovere la piattaforma principale!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s su %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collezioni su %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(non è stata selezionata alcuna collezione di lingue!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(è necessario cambiare TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(non si hanno i permessi di scrittura - cambiare il percorso!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1732,6 +1753,29 @@ msgid "XeTeX packages"
 msgstr "Pacchetti XeTeX"
 
 #~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Benvenuti nell'installazione di TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Questo programma vi guiderà attraverso il processo di installazione.\n"
+#~ "\n"
+#~ "Per un'installazione avanzata e personalizzabile, consultate\n"
+#~ "il sito web oppure la guida all'installazione."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "In alternativa, usate il programma install-tl-advanced.bat"
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "In alternativa, usate l'opzione --gui perltk di install-tl."
+
+#~ msgid ""
 #~ "Loading local TeX Live Database\n"
 #~ "This may take some time, please wait!"
 #~ msgstr ""
diff --git a/Master/tlpkg/translations/ja.po b/Master/tlpkg/translations/ja.po
index ea8be5c7a18..36ec8fd666a 100644
--- a/Master/tlpkg/translations/ja.po
+++ b/Master/tlpkg/translations/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2012-02-21 19:04+0900\n"
 "Last-Translator: Koji Yokota <yokota@res.otaru-uc.ac.jp>\n"
 "Language-Team: Japanese <lyx-doc@lyx.org>\n"
@@ -19,33 +19,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s の導入"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "終了"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "←戻る"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "←戻る"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "次へ→"
 
@@ -57,92 +59,91 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"TeX Live %s の導入へようこそ。\n"
-"http://tug.org/texlive\n"
-"\n"
-"このウィザードが、あなたのインストールのご案内をします。\n"
-"\n"
-"設定可能な、高度な導入を行うには、導入ガイドの\n"
-"ウェブページをごらんください。"
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "あるいは install-tl-advanced.bat を使用してください。"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "あるいは install-tl に引数 --gui expert を付けてください。"
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "既定リポジトリを変更"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr "コマンドラインリポジトリ "
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "ローカルリポジトリ"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "ネットワークリポジトリ"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "既定リモートレポジトリ"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "リポジトリを選択"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "ミラー:"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "大陸"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "国"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "ミラー"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr "リポジトリデータベースが読み込まれるまでおまちください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "これには少し時間がかかります！"
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -160,17 +161,17 @@ msgstr "これには少し時間がかかります！"
 msgid "Cancel"
 msgstr "取消"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr "リモートTeX Liveデータベースを読み込めませんでした:"
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 msgid "Please go back and select a different mirror."
 msgstr "前に戻って別のミラーを選択してください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -183,12 +184,12 @@ msgstr ""
 "ローカル　: %s\n"
 "リポジトリ: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "導入先フォルダ:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -216,7 +217,7 @@ msgstr "導入先フォルダ:"
 msgid "Change"
 msgstr "変更"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -224,32 +225,32 @@ msgstr ""
 "導入先フォルダには、インストールしたものが入ります。\n"
 "最後尾に年を入れたままにしておくことを強くお勧めします。"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "必要ディスク領域:"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(既定値が許されないか書き込み不能です―変更してください！)"
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "右の変数のパスを入力→"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -276,41 +277,41 @@ msgstr "右の変数のパスを入力→"
 msgid "Ok"
 msgstr "OK"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "既定用紙寸法"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "メニュー短絡キーを追加"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "ファイル関連付けを変更する"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "レジストリの PATH 設定を調整する"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "全ユーザ用に導入"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr "この画面では、いくつかのオプションを設定することができます。"
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -323,7 +324,7 @@ msgstr ""
 "変更したいものがある場合には、前に戻ってください。\n"
 "そうでなければ、「導入」ボタンを押してください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -334,20 +335,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "はい"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -358,29 +359,29 @@ msgstr "はい"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "いいえ"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "導入"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -396,8 +397,8 @@ msgstr ""
 "ただけると助かります。 グループの一覧は、ウェブ上の http://tug.org/"
 "usergroups.html にあります"
 
-#: tlpkg/installer/install-menu-wizard.pl:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -410,8 +411,8 @@ msgstr ""
 "特に、現セッションと今後のために、%s/bin/%s を\n"
 "PATH に追加してください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -419,18 +420,18 @@ msgstr ""
 "導入の過程において警告が発せられました。\n"
 "警告メッセージは以下のとおりです。"
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "TeX Live へようこそ！"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "終了"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "なし"
@@ -460,8 +461,8 @@ msgstr "読み込み"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -498,13 +499,13 @@ msgid "Basic Information"
 msgstr "基本情報"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "バイナリシステム"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "選択したスキーム"
 
@@ -513,12 +514,12 @@ msgid "Further Customization"
 msgstr "追加設定"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "標準コレクション"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "言語コレクション"
 
@@ -591,7 +592,7 @@ msgid "Install font/macro source tree"
 msgstr "font と macro のソースツリーを導入"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "システムディレクトリに symlink を作成する"
 
@@ -607,100 +608,120 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "TeX Live の導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "導入プロセス"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "変数の値を変更"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "%s のパスを入力してください（%s を表すには ~ を使用してください）"
 
-#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "コレクションの任意選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "導入するコレクションを選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "すべてを選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "すべてを非選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "言語サポートを選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "言語固有の説明書を選択してください"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "symlink を標準ディレクトリに作成する"
 
-#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "バイナリ先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "man ページ先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "info 先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "arch-os を選択してください"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr "主幹プラットフォームを取り除くことはできません！"
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s（全 %s 中）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s コレクション（全 %s 中）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "（言語コレクションが選択されていません！）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "（先に TEXDIR を変更してください！）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "（既定値では書き込みできません。変更してください！）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1737,6 +1758,29 @@ msgid "XeTeX packages"
 msgstr "XeTeXパッケージ"
 
 #~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "TeX Live %s の導入へようこそ。\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "このウィザードが、あなたのインストールのご案内をします。\n"
+#~ "\n"
+#~ "設定可能な、高度な導入を行うには、導入ガイドの\n"
+#~ "ウェブページをごらんください。"
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "あるいは install-tl-advanced.bat を使用してください。"
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "あるいは install-tl に引数 --gui expert を付けてください。"
+
+#~ msgid ""
 #~ "Loading local TeX Live Database\n"
 #~ "This may take some time, please wait!"
 #~ msgstr ""
diff --git a/Master/tlpkg/translations/messages.pot b/Master/tlpkg/translations/messages.pot
index a2bde01c290..b7ac01dffef 100644
--- a/Master/tlpkg/translations/messages.pot
+++ b/Master/tlpkg/translations/messages.pot
@@ -1,13 +1,14 @@
-# TeX Live installer/tlmgrgui messages.
-# Copyright (C) 2012 TeX Live team.
-# This file is distributed under the same license as tlmgr.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR TeX Live Team
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: TeX Live translation\n"
-"Report-Msgid-Bugs-To: tldoc@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"Project-Id-Version: TeX Live 2010\n"
+"Report-Msgid-Bugs-To: tex-live@tug.org\n"
+"POT-Creation-Date: 2012-06-01 04:35+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,33 +19,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr ""
 
@@ -56,85 +59,91 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
+msgid "Best to turn off your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -152,17 +161,17 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 msgid "Please go back and select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -171,12 +180,12 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -204,38 +213,38 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 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:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -262,41 +271,41 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -305,7 +314,7 @@ msgid ""
 "otherwise press the \"Install\" button."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -316,20 +325,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -340,29 +349,29 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -372,8 +381,8 @@ msgid ""
 "list of groups is available on the web at http://tug.org/usergroups.html."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -382,25 +391,25 @@ msgid ""
 "to your PATH for current and future sessions."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr ""
@@ -430,8 +439,8 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -463,13 +472,13 @@ msgid "Basic Information"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr ""
 
@@ -478,12 +487,12 @@ msgid "Further Customization"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr ""
 
@@ -556,7 +565,7 @@ msgid "Install font/macro source tree"
 msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr ""
 
@@ -572,100 +581,120 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
diff --git a/Master/tlpkg/translations/nl.po b/Master/tlpkg/translations/nl.po
index 9740d3095aa..032a4ead55e 100644
--- a/Master/tlpkg/translations/nl.po
+++ b/Master/tlpkg/translations/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2012-05-27 12:42+0100\n"
 "Last-Translator: Siep Kroonenberg <siepo@cybercomm.nl>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -14,33 +14,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s Installatie"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Stoppen"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Terug"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Terug"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Volgende >"
 
@@ -52,94 +54,92 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Welkom bij de installatie van TeX Live %s\n"
-"http://tug.org/texlive\n"
-"\n"
-"Deze wizard zal u door de installatie leiden.\n"
-"\n"
-"Raadpleeg voor geavanceerde installatie op maat\n"
-"de web paginas of de installatie-gids."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Of gebruik install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Of gebruik de optie --gui expert bij aanroep van install-tl"
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "Verander standaard installatie-bron"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr "Installatie-bron volgens commando-regel"
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKALE INSTALLATIE-BRONNEN"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "ONLINE INSTALLATIE-BRONNEN"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Standaard online installatie-bron"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "Selekteer installatie-bron"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "Mirror:"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "Werelddeel"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "Landen"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "Mirrors"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 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:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "Dit gaat even duren!"
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
-#: texmf/scripts/texlive/tlmgrgui.pl:611
-#: texmf/scripts/texlive/tlmgrgui.pl:612
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
+#: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
 #: texmf/scripts/texlive/tlmgrgui.pl:1367
@@ -156,17 +156,17 @@ msgstr "Dit gaat even duren!"
 msgid "Cancel"
 msgstr "Afbreken"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr "Kon de online TeX Live database niet laden:"
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 msgid "Please go back and select a different mirror."
 msgstr "Ga terug en kies een andere mirror."
 
-#: tlpkg/installer/install-menu-wizard.pl:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -179,12 +179,12 @@ msgstr ""
 "  lokaal: %s\n"
 "  installatie-bron:%s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Bestemmings-folder"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -212,7 +212,7 @@ msgstr "Bestemmings-folder"
 msgid "Change"
 msgstr "Wijzig"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -220,38 +220,35 @@ 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:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "benodigde schijfruimte"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(default niet toegestaan of niet schrijfbaar - aub wijzigen!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Pad voor"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
-#: texmf/scripts/texlive/tlmgrgui.pl:238
-#: texmf/scripts/texlive/tlmgrgui.pl:611
-#: texmf/scripts/texlive/tlmgrgui.pl:615
-#: texmf/scripts/texlive/tlmgrgui.pl:617
-#: texmf/scripts/texlive/tlmgrgui.pl:635
-#: texmf/scripts/texlive/tlmgrgui.pl:814
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
+#: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
+#: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1416
 #: texmf/scripts/texlive/tlmgrgui.pl:1446
@@ -275,41 +272,41 @@ msgstr "Pad voor"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Standaard papier-formaat voor"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "Maak TeX Live menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Wijzig bestandstypen"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "PATH aanpassen in registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Installeer voor alle gebruikers"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr "Met dit scherm kunt u enkele opties instellen."
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -322,7 +319,7 @@ msgstr ""
 "Ga terug als u iets wilt wijzigen,\n"
 "zo niet, klik dan op de \"Installeren\" knop."
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -333,20 +330,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Ja"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -357,33 +354,36 @@ msgstr "Ja"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "Nee"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Installeren"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and corrections. TeX Live is a joint project of the TeX user groups around the world; please consider supporting it by joining the group best for you. The list of groups is available on the web at http://tug.org/usergroups.html."
+"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+"corrections. TeX Live is a joint project of the TeX user groups around the "
+"world; please consider supporting it by joining the group best for you. The "
+"list of groups is available on the web at http://tug.org/usergroups.html."
 msgstr ""
 "Zie %s/index.html voor links naar documentatie.\n"
 "De TeX Live web site (http://tug.org/texlive/) bevat\n"
@@ -392,8 +392,8 @@ msgstr ""
 "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:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -406,8 +406,8 @@ msgstr ""
 "En het belangrijkste: voeg %s/bin/%s\n"
 "toe aan PATH voor de huidige en voor toekomstige sessies."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -415,18 +415,18 @@ msgstr ""
 "Er waren enkele waarschuwingen gedurende installatie.\n"
 "Hier is de lijst van waarschuwingen:"
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Welkom bij TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Sluit af"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Geen"
@@ -456,8 +456,8 @@ msgstr "Laad"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -477,7 +477,8 @@ msgstr "Kies een andere mirror."
 #: tlpkg/installer/install-menu-perltk.pl:309
 #, perl-format
 msgid ""
-"The TeX Live versions of the local installation and the repository being accessed are not compatible:\n"
+"The TeX Live versions of the local installation and the repository being "
+"accessed are not compatible:\n"
 "  local: %s\n"
 "  repository: %s\n"
 "Please select a different mirror."
@@ -493,13 +494,13 @@ msgid "Basic Information"
 msgstr "Basisinformatie"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Platform(s)"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Gekozen schema"
 
@@ -508,12 +509,12 @@ msgid "Further Customization"
 msgstr "Verdere verfijning"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Standaard-collecties"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Taal-collecties"
 
@@ -586,7 +587,7 @@ msgid "Install font/macro source tree"
 msgstr "Installeer font/macro bron folder"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Maak symlinks naar standaard-folders"
 
@@ -602,100 +603,120 @@ msgstr "Aktualiseer pakketten vanuit CTAN"
 msgid "Install TeX Live"
 msgstr "Installeer TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Installatie"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Nieuwe waarde"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Pad voor %s (gebruik ~ voor %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "Eigen selektie van collekties"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Kies te installeren collecties"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Kies alles"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Kies niets"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Keuze van talen"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Talen voor documentatie"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: 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:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "programma's naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "manpages naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "info naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Kies platform(s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr "Verwijdering van de hoofd-architektuur niet mogelijk!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s van %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collecties van %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(geen taal-collectie geselecteerd!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(TEXDIR eerst veranderen!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(geen schrijf-toegang - wijzig!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -730,7 +751,8 @@ msgid ""
 msgstr ""
 "U heeft geen permissie om ook maar iets aan de installatie te wijzigen,\n"
 "in het bijzonder, u heeft geen schrijfrechten voor de folder %s.\n"
-"Draai dit programma als Administrator, of neem contact op met uw lokale systeembeheerder.\n"
+"Draai dit programma als Administrator, of neem contact op met uw lokale "
+"systeembeheerder.\n"
 "\n"
 "De meeste knoppen zijn gedeactiveerd."
 
@@ -755,8 +777,7 @@ msgstr "Laat instellingen zien"
 msgid "Status"
 msgstr "Status"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:304
-#: texmf/scripts/texlive/tlmgrgui.pl:358
+#: texmf/scripts/texlive/tlmgrgui.pl:304 texmf/scripts/texlive/tlmgrgui.pl:358
 msgid "all"
 msgstr "alle"
 
@@ -931,7 +952,9 @@ msgstr "Deaktiveer automatische installatie van nieuwe pakketten"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:556
 msgid "Disable auto-removal of server-deleted packages"
-msgstr "Deaktiveer automatische verwijdering van pakketten die op de server zijn verwijderd"
+msgstr ""
+"Deaktiveer automatische verwijdering van pakketten die op de server zijn "
+"verwijderd"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:563
 msgid "Update filename database"
@@ -982,8 +1005,7 @@ msgstr ""
 msgid "Manual"
 msgstr "Handleiding"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
-#: texmf/scripts/texlive/tlmgrgui.pl:634
+#: texmf/scripts/texlive/tlmgrgui.pl:632 texmf/scripts/texlive/tlmgrgui.pl:634
 msgid "About"
 msgstr "Info"
 
@@ -1267,7 +1289,8 @@ msgstr ""
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
-"Please select \"Update all installed\" button after dismissing this dialogue.\n"
+"Please select \"Update all installed\" button after dismissing this "
+"dialogue.\n"
 "\n"
 "The program will terminate after the update.\n"
 "Then you can restart the program for further updates."
@@ -1285,8 +1308,12 @@ msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr "Nog minstens %s verdere updates komen beschikbaar na updaten van tlmgr"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2288
-msgid "Please wait a bit after the program has terminated so that the update can be completed."
-msgstr "Wacht aub. even nadat het programma is geeindigd, zodat het bijwerken kan worden voltooid."
+msgid ""
+"Please wait a bit after the program has terminated so that the update can be "
+"completed."
+msgstr ""
+"Wacht aub. even nadat het programma is geeindigd, zodat het bijwerken kan "
+"worden voltooid."
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2368
 #: texmf/scripts/texlive/tlmgrgui.pl:2370
@@ -1708,7 +1735,8 @@ msgstr "PSTricks pakketten"
 
 #: tlpkg/translations/shortdesc.pl:89
 msgid "Support for publishers, theses, standards, conferences, etc."
-msgstr "Ondersteuning voor uitgevers, proefschriften, standaarden, conferenties etc."
+msgstr ""
+"Ondersteuning voor uitgevers, proefschriften, standaarden, conferenties etc."
 
 #: tlpkg/translations/shortdesc.pl:90
 msgid "Typesetting for natural and computer sciences"
@@ -1730,6 +1758,29 @@ msgstr "Windows hulpprogramma's"
 msgid "XeTeX packages"
 msgstr "XeTeX pakketten"
 
+#~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Welkom bij de installatie van TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Deze wizard zal u door de installatie leiden.\n"
+#~ "\n"
+#~ "Raadpleeg voor geavanceerde installatie op maat\n"
+#~ "de web paginas of de installatie-gids."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Of gebruik install-tl-advanced.bat"
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "Of gebruik de optie --gui expert bij aanroep van install-tl"
+
 #~ msgid "After install, use tlnet on CTAN for package updates"
 #~ msgstr "Aktualiseer de installatie na voltooiing via tlnet op CTAN"
 
diff --git a/Master/tlpkg/translations/pl.po b/Master/tlpkg/translations/pl.po
index d68550e0f4c..6608ceac379 100644
--- a/Master/tlpkg/translations/pl.po
+++ b/Master/tlpkg/translations/pl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2012-05-29 19:11+0100\n"
 "Last-Translator: staszek <staw@gust.org.pl>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -14,33 +14,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalowanie TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Zakończ"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "<Cofnij"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "<Cofnij"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Dalej >"
 
@@ -52,95 +54,92 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Witamy w programie instalującym TeX Live %s\n"
-"http://tug.org/texlive\n"
-"\n"
-"Program ten pozwala na uproszczoną instalację całej dystrybucji.\n"
-"\n"
-"Aby dokonać zaawansowanej instalacji (z wyborem\n"
-"schematów, kolekcji itp.) opuść program i uruchom go\n"
-"z linii poleceń: install-tl -gui."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Lub użyj install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Lub użyj parametru --gui expert dla install-tl."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "Zmień domyślne repozytorium"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr "Repozytorium z linii poleceń"
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKALNE REPOZYTORIA"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "REPOZYTORIA W SIECI"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Domyślne repozytorium"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "Wybierz repozytorium"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "Mirror (kopia CTAN):"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "Kontynent"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "Kraje"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "Lustrzane kopie zasobów"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr "Proszę czekać na wczytanie bazy danych repozytorium."
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "Trochę to potrwa..."
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
-#: texmf/scripts/texlive/tlmgrgui.pl:611
-#: texmf/scripts/texlive/tlmgrgui.pl:612
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
+#: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
 #: texmf/scripts/texlive/tlmgrgui.pl:1367
@@ -157,17 +156,17 @@ msgstr "Trochę to potrwa..."
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 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:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 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:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -180,12 +179,12 @@ msgstr ""
 "         lokalnie: %s\n"
 "repozytorium: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Docelowy folder:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -213,7 +212,7 @@ msgstr "Docelowy folder:"
 msgid "Change"
 msgstr "Zmień"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -221,38 +220,36 @@ msgstr ""
 "Docelowy folder będzie zawierał instalację.\n"
 "Zaleca się, aby ostatnim komponentem był rok wydania. "
 
-#: tlpkg/installer/install-menu-wizard.pl:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "wymagana przestrzeń na dysku:"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
-msgstr "(domyślnie niedozwolone lub brak uprawnień do zapisu - proszę zmienić!)"
+msgstr ""
+"(domyślnie niedozwolone lub brak uprawnień do zapisu - proszę zmienić!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Podaj ścieżkę dla"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
-#: texmf/scripts/texlive/tlmgrgui.pl:238
-#: texmf/scripts/texlive/tlmgrgui.pl:611
-#: texmf/scripts/texlive/tlmgrgui.pl:615
-#: texmf/scripts/texlive/tlmgrgui.pl:617
-#: texmf/scripts/texlive/tlmgrgui.pl:635
-#: texmf/scripts/texlive/tlmgrgui.pl:814
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
+#: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
+#: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
+#: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1416
 #: texmf/scripts/texlive/tlmgrgui.pl:1446
@@ -276,41 +273,41 @@ msgstr "Podaj ścieżkę dla"
 msgid "Ok"
 msgstr "Zamknij"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Domyślny format papieru"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "Dodaj skróty do menu systemowego"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Zmiana asocjacji typu plików"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "Zapis ustawienia PATH w pliku rejestru"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Instalacja dla wszystkich użytkowników "
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr "Okno to pozwala skonfigurować niektóre ustawienia"
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -323,7 +320,7 @@ msgstr ""
 "(jeśli chcesz je zmienić, cofnij się,\n"
 "w przeciwnym wypadku naciśnij przycisk \"Instaluj\"):"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -334,20 +331,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Tak"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -358,42 +355,46 @@ msgstr "Tak"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "Nie"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Instaluj"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
-"The TeX Live web site (http://tug.org/texlive/) contains any updates and corrections. TeX Live is a joint project of the TeX user groups around the world; please consider supporting it by joining the group best for you. The list of groups is available on the web at http://tug.org/usergroups.html."
+"The TeX Live web site (http://tug.org/texlive/) contains any updates and "
+"corrections. TeX Live is a joint project of the TeX user groups around the "
+"world; please consider supporting it by joining the group best for you. The "
+"list of groups is available on the web at http://tug.org/usergroups.html."
 msgstr ""
 "Patrz %s/index.html z odnośnikami do dokumentacji.\n"
-"Na stronie TeX Live (http://tug.org/texlive/) znajdziesz aktualizacje i poprawki.\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:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -406,8 +407,8 @@ msgstr ""
 "Najważniejsze: dodaj %s/bin/%s\n"
 "do zmiennej PATH dla bieżącej i przyszłych sesji."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -415,18 +416,18 @@ msgstr ""
 "Podczas instalacji wystąpiło kilka ostrzeżeń.\n"
 "Oto ich podsumowanie:"
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "TeX Live wita!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Zakończ"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Nie"
@@ -456,8 +457,8 @@ msgstr "Wczytaj"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -477,7 +478,8 @@ msgstr "Proszę wybrać inną kopię zasobów (mirror)."
 #: tlpkg/installer/install-menu-perltk.pl:309
 #, perl-format
 msgid ""
-"The TeX Live versions of the local installation and the repository being accessed are not compatible:\n"
+"The TeX Live versions of the local installation and the repository being "
+"accessed are not compatible:\n"
 "  local: %s\n"
 "  repository: %s\n"
 "Please select a different mirror."
@@ -492,13 +494,13 @@ msgid "Basic Information"
 msgstr "Informacje podstawowe"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Programy dla systemów operacyjnych"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Wybrany schemat instalacji"
 
@@ -507,12 +509,12 @@ msgid "Further Customization"
 msgstr "Dalsze ustawienia"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Kolekcje standardowe"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Kolekcje językowe"
 
@@ -585,7 +587,7 @@ msgid "Install font/macro source tree"
 msgstr "Instalowanie plików źródłowych fontu/makr"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Dowiązania symboliczne w folderach systemowych"
 
@@ -601,100 +603,120 @@ msgstr "Po instalacji pobieraj aktualizacje pakietów z CTAN"
 msgid "Install TeX Live"
 msgstr "Zainstaluj TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Instalacja w toku"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Zmień wartości zmiennych"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, 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:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "indywidualny wybór kolekcji"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Wybór kolekcji do zainstalowania"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Wybierz wszystko"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Wyłącz wszystko"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Wybór obsługi języka"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Wybór dokumentacji w języku"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: 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:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "Programy według"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "Strony man według"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "Dokumentacje info według"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Wybór systemu operacyjnego"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr "Usuwanie binariów dla głównej platformy jest niemożliwa!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s spośród %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcji spośród %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(nie zaznaczono żadnej kolekcji językowej!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(proszę zmienić najpierw TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(domyślnie praw praw do zapisu - proszę zmienić!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -755,8 +777,7 @@ msgstr "Konfiguracja wyświetlania"
 msgid "Status"
 msgstr "Status"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:304
-#: texmf/scripts/texlive/tlmgrgui.pl:358
+#: texmf/scripts/texlive/tlmgrgui.pl:304 texmf/scripts/texlive/tlmgrgui.pl:358
 msgid "all"
 msgstr "wszystkie"
 
@@ -931,7 +952,8 @@ msgstr "Wyłącz automatyczne instalowanie nowszych pakietów"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:556
 msgid "Disable auto-removal of server-deleted packages"
-msgstr "Wyłącz automatyczne usuwanie pakietów, które zostały usunięte z repozytorium"
+msgstr ""
+"Wyłącz automatyczne usuwanie pakietów, które zostały usunięte z repozytorium"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:563
 msgid "Update filename database"
@@ -982,8 +1004,7 @@ msgstr ""
 msgid "Manual"
 msgstr "Podręcznik"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:632
-#: texmf/scripts/texlive/tlmgrgui.pl:634
+#: texmf/scripts/texlive/tlmgrgui.pl:632 texmf/scripts/texlive/tlmgrgui.pl:634
 msgid "About"
 msgstr "O programie"
 
@@ -1050,7 +1071,9 @@ msgstr "Kolekcja:"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:731
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
-msgstr "Uwaga:  nr wersji wg TeX Catalogue może być niezbyt aktualny lub wręcz błędny."
+msgstr ""
+"Uwaga:  nr wersji wg TeX Catalogue może być niezbyt aktualny lub wręcz "
+"błędny."
 
 #: texmf/scripts/texlive/tlmgrgui.pl:769
 msgid "Depends:"
@@ -1267,14 +1290,17 @@ msgstr ""
 msgid ""
 "Updates for the tlmgr are present.\n"
 "Installation and upgrades won't work without being forced.\n"
-"Please select \"Update all installed\" button after dismissing this dialogue.\n"
+"Please select \"Update all installed\" button after dismissing this "
+"dialogue.\n"
 "\n"
 "The program will terminate after the update.\n"
 "Then you can restart the program for further updates."
 msgstr ""
 "Dostępna jest aktualizacja programu tlmgr.\n"
-"Instalacje pakietów i aktualizacje nie będą działały bez włączenia trybu wymuszonego.\n"
-"Proszę  zaznaczyć przycisk \"Aktualizuj wszystkie zainstalowane pakiety\" po zamknięciu tego komunikatu.\n"
+"Instalacje pakietów i aktualizacje nie będą działały bez włączenia trybu "
+"wymuszonego.\n"
+"Proszę  zaznaczyć przycisk \"Aktualizuj wszystkie zainstalowane pakiety\" po "
+"zamknięciu tego komunikatu.\n"
 "\n"
 "Po aktualizacji program zakończy działanie.\n"
 "Uruchom ponownie dla dalszych aktualizacji. "
@@ -1285,8 +1311,12 @@ msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr "Po aktualizacji tlmgr dostępnych jest dalszych %s aktualizacji."
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2288
-msgid "Please wait a bit after the program has terminated so that the update can be completed."
-msgstr "Proszę zaczekać chwilę po zakończeniu programu, aby aktualizacja została dokonana. "
+msgid ""
+"Please wait a bit after the program has terminated so that the update can be "
+"completed."
+msgstr ""
+"Proszę zaczekać chwilę po zakończeniu programu, aby aktualizacja została "
+"dokonana. "
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2368
 #: texmf/scripts/texlive/tlmgrgui.pl:2370
@@ -1730,6 +1760,30 @@ msgstr "Dodatkowe programy dla Windows"
 msgid "XeTeX packages"
 msgstr "Pakiety dla XeTeX"
 
+#~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Witamy w programie instalującym TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Program ten pozwala na uproszczoną instalację całej dystrybucji.\n"
+#~ "\n"
+#~ "Aby dokonać zaawansowanej instalacji (z wyborem\n"
+#~ "schematów, kolekcji itp.) opuść program i uruchom go\n"
+#~ "z linii poleceń: install-tl -gui."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Lub użyj install-tl-advanced.bat"
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "Lub użyj parametru --gui expert dla install-tl."
+
 #~ msgid "After install, use tlnet on CTAN for package updates"
 #~ msgstr "Po instalacji użyj do aktualizacji pakietów katalog tlnet na CTAN"
 
diff --git a/Master/tlpkg/translations/pt_br.po b/Master/tlpkg/translations/pt_br.po
index 315ee1aa28b..6d986944516 100644
--- a/Master/tlpkg/translations/pt_br.po
+++ b/Master/tlpkg/translations/pt_br.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2012-05-12 09:07-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,33 +15,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalação do TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Sair"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Anterior"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Anterior"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Próximo >"
 
@@ -53,93 +55,92 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Bem-vindo à instalação do TeX Live %s\n"
-"http://tug.org/texlive\n"
-"\n"
-"Este assistente o guiará através da instalação.\n"
-"\n"
-"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:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Ou utilize install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Ou utilize o argumento '--gui expert' em install-tl."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "Alterar repositório padrão"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr "Repositório de linha de comando"
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "REPOSITÓRIOS LOCAIS"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "REPOSITÓRIOS DE REDE"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Repositório remoto padrão"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "Selecione repositório"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "Espelho:"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "Continente"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "Países"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "Espelhos"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 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:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "Isto vai levar algum tempo!"
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -157,17 +158,17 @@ msgstr "Isto vai levar algum tempo!"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 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:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 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:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -180,12 +181,12 @@ msgstr ""
 "      local: %s\n"
 "repositório: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Diretório de destino:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -213,7 +214,7 @@ msgstr "Diretório de destino:"
 msgid "Change"
 msgstr "Alterar"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -221,33 +222,33 @@ 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:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "espaço em disco requerido:"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 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:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Digite o caminho para"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -274,41 +275,41 @@ msgstr "Digite o caminho para"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Tamanho padrão do papel"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "Adicionar atalhos de menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Alterar as associações de arquivos"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "Ajustar a configuração da variável PATH no registro"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Instalação para todos os usuários"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 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:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -322,7 +323,7 @@ msgstr ""
 "às etapas anteriores; caso contrário, pressione o\n"
 "botão  \"Instalar\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -333,20 +334,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Sim"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -357,29 +358,29 @@ msgstr "Sim"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "Não"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Instalar"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -395,8 +396,8 @@ msgstr ""
 "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:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -409,8 +410,8 @@ msgstr ""
 "E o mais importante adicione %s/bin/%s\n"
 "em PATH para as sessões futuras."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -418,18 +419,18 @@ 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:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Bem-vindo ao TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Finalizar"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Nenhum"
@@ -459,8 +460,8 @@ msgstr "Carregar"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -497,13 +498,13 @@ msgid "Basic Information"
 msgstr "Informação básica"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Sistema(s) binário(s)"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Esquema selecionado"
 
@@ -512,12 +513,12 @@ msgid "Further Customization"
 msgstr "Personalização adicional"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Coleções padrão"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Coleções de linguagens"
 
@@ -590,7 +591,7 @@ msgid "Install font/macro source tree"
 msgstr "Instalar a árvore de código-fonte de fontes/macros"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Criar links simbólicos nos diretórios do sistema"
 
@@ -606,100 +607,120 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "Instalar o TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Processo de instalação"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Alterar valor da variável"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, 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:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "seleção personalizada de coleções"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Selecione as coleções a serem instaladas"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Remover seleção de tudo"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Selecionar suporte de idioma"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Selecionar documentação específica para o idioma"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: 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:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "binários para"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "páginas de manual para"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "informação para"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Selecionar arquitetura do sistema operacional"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 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:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s de %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s coleções de %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(nenhuma coleção de idioma foi selecionada!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(por favor, altere TEXDIR primeiro!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 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:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1744,6 +1765,29 @@ msgstr "Programas de suporte ao Windows"
 msgid "XeTeX packages"
 msgstr "Pacotes XeTeX"
 
+#~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Bem-vindo à instalação do TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Este assistente o guiará através da instalação.\n"
+#~ "\n"
+#~ "Para uma instalação personalizada ou avançada, por favor\n"
+#~ "consulte as páginas da web ou o guia de instalação."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Ou utilize install-tl-advanced.bat"
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "Ou utilize o argumento '--gui expert' em install-tl."
+
 #~ msgid "After install, use tlnet on CTAN for package updates"
 #~ msgstr "Após a instalação, use tlnet em CTAN para atualizações de pacotes"
 
diff --git a/Master/tlpkg/translations/ru.po b/Master/tlpkg/translations/ru.po
index 1a237ccb9e7..5851bf4e49e 100644
--- a/Master/tlpkg/translations/ru.po
+++ b/Master/tlpkg/translations/ru.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
-"Report-Msgid-Bugs-To: tldoc@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"Report-Msgid-Bugs-To: tex-live@tug.org\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2012-05-28 13:43+0900\n"
 "Last-Translator: Vladimir Lomov <irk.translator@gmail.com>\n"
 "Language-Team: Russian <tldoc@tug.org>\n"
@@ -20,37 +20,38 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Установка TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Выход"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Назад"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Назад"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Далее >"
 
-# Следует подумать о новом переводе последнего предложения
 #: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
@@ -59,92 +60,91 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Вас приветствует программа установки TeX Live %s\n"
-"http://tug.org/texlive\n"
-"\n"
-"Этот Помощник проведёт вас через процедуру установки.\n"
-"\n"
-"Для более гибкой настройки установки просмотрите, пожалуйста,\n"
-"web-страницы или руководство по установке."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Или используйте install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Или используйте опцию --gui expert для install-tl."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "Изменить репозиторий по умолчанию"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr "Репозиторий указанный в командной строке"
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "ЛОКАЛЬНЫЕ РЕПОЗИТОРИИ"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "СЕТЕВЫЕ РЕПОЗИТОРИИ"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Сетевой репозиторий по умолчанию"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "Выбрать репозиторий"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "Зеркало:"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "Материк"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "Страны"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "Зеркала"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr "Подождите, пожалуйста, пока загрузится база данных репозитория."
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "Это может занять некоторое время!"
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -162,17 +162,17 @@ msgstr "Это может занять некоторое время!"
 msgid "Cancel"
 msgstr "Отмена"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr "Невозможно загрузить сетевую базу данных TeX Live:"
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 msgid "Please go back and select a different mirror."
 msgstr "Вернитесь назад и выберите другое зеркало."
 
-#: tlpkg/installer/install-menu-wizard.pl:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -185,12 +185,12 @@ msgstr ""
 "    локальная: %s\n"
 "в репозитории: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Целевой каталог:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -218,7 +218,7 @@ msgstr "Целевой каталог:"
 msgid "Change"
 msgstr "Изменить"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -226,34 +226,34 @@ msgstr ""
 "В целевом каталоге будут размещены установленные файлы.\n"
 "Настоятельно рекомендуем сохранить год выпуска дистрибутива в его названии."
 
-#: tlpkg/installer/install-menu-wizard.pl:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "требуется места на диске:"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 "(нет доступа или прав на запись для каталога по умолчанию — задайте другое "
 "значение!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Введите путь для"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -280,41 +280,41 @@ msgstr "Введите путь для"
 msgid "Ok"
 msgstr "Ок"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Формат страницы по умолчанию"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "Добавить в меню «Пуск»"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Изменить привязку файлов"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "Добавить в переменную PATH"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Доступно для всех пользователей"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr "В этом окне можно настроить некоторые параметры"
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -327,7 +327,7 @@ msgstr ""
 "Если нужно что-то изменить, нажмите кнопку «Назад»,\n"
 "если всё в порядке, нажмите кнопку «Установить»."
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -338,20 +338,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Да"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -362,29 +362,29 @@ msgstr "Да"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "Нет"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Установить"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -399,8 +399,8 @@ msgstr ""
 "всей планеты; поддержите, пожалуйста, проект, присоединившись к подходящей "
 "вам группе. Список групп доступен на странице http://tug.org/usergroups.html."
 
-#: tlpkg/installer/install-menu-wizard.pl:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -413,8 +413,8 @@ msgstr ""
 "Самое главное, добавьте %s/bin/%s\n"
 "к вашему PATH для текущей и будущих сессий."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -422,18 +422,18 @@ msgstr ""
 "В процессе установки появлялось несколько предупреждений.\n"
 "Вот список этих предупреждений:"
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Вас приветствует TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Закончить"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Нет"
@@ -463,8 +463,8 @@ msgstr "Загрузить"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -501,13 +501,13 @@ msgid "Basic Information"
 msgstr "Базовая настройка"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Программы для систем(ы)"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Выбранная схема"
 
@@ -516,12 +516,12 @@ msgid "Further Customization"
 msgstr "Дополнительные настройки"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Стандартные коллекции"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Коллекции поддержки языков"
 
@@ -594,7 +594,7 @@ msgid "Install font/macro source tree"
 msgstr "Установить дерево исходных файлов font/macro"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Создать символьные ссылки в системных каталогах"
 
@@ -610,100 +610,120 @@ msgstr "После установки, получайте обновления �
 msgid "Install TeX Live"
 msgstr "Установить TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Процесс установки"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Изменить значение переменной"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Введите путь для %s (используйте ~ для %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "выбор коллекций"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Выберите устанавливаемые коллекции"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Выбрать всё"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Снять выделение"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Выберите языковую поддержку"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Выберите переводы документации"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "создать символьные ссылки в стандартных каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "программы в"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "страницы man в"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "страницы info в"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Выберите архитектуру-ОС"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr "Удаление основной архитектуры невозможно!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s из %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s коллекций из %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(не выбрана языковая коллекция!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(пожалуйста, измените сначала TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(нет прав на запись в каталог по умолчанию — пожалуйста измените!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1746,6 +1766,30 @@ msgstr "Программы для Windows"
 msgid "XeTeX packages"
 msgstr "Пакеты XeTeX"
 
+# Следует подумать о новом переводе последнего предложения
+#~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Вас приветствует программа установки TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Этот Помощник проведёт вас через процедуру установки.\n"
+#~ "\n"
+#~ "Для более гибкой настройки установки просмотрите, пожалуйста,\n"
+#~ "web-страницы или руководство по установке."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Или используйте install-tl-advanced.bat"
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "Или используйте опцию --gui expert для install-tl."
+
 #~ msgid "After install, use tlnet on CTAN for package updates"
 #~ msgstr "После установки, используйте tlnet на CTAN для обновления пакетов"
 
diff --git a/Master/tlpkg/translations/sk.po b/Master/tlpkg/translations/sk.po
index 3a89eadbd7c..48d6667c64c 100644
--- a/Master/tlpkg/translations/sk.po
+++ b/Master/tlpkg/translations/sk.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2012-05-17 23:09+0100\n"
 "Last-Translator: Ján Buša <jan.busa@tuke.sk>\n"
 "Language-Team:  <tex-live@tug.org>\n"
@@ -15,33 +15,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Inštalácia TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Ukončiť"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Späť"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Späť"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Ďalej >"
 
@@ -53,92 +55,91 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Vitajte pri inštalácii systému TeX Live %s\n"
-" http://tug.org/texlive\n"
-"\n"
-"Tento sprievodca vás bude sprevádzať počas inštalácie.\n"
-"\n"
-"O pokročilej prispôsobiteľnej inštalácii sa, prosim, informujte\n"
-" na webových stránkach alebo v inštalačnej príručke."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Prípadne  použite install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Použite prípadne argument --gui expert príkazu install-tl."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "Zmeniť predvolenú schránku"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr "Schránka príkazových riadkov"
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKÁLNE SCHRÁNKY"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "SIEŤOVÉ SCHRÁNKY"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Predvolená vzdialená schránka"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "Zvoliť schránku"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "Zrkadlo:"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "Kontinent"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "Krajiny"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "Zrkadlá"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 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:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "Bude to trvať istý čas!"
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -156,17 +157,17 @@ msgstr "Bude to trvať istý čas!"
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr "Nepodarilo sa načítať vzdialenú databázu TeX Live:"
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 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:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -179,12 +180,12 @@ msgstr ""
 "     lokálne: %s\n"
 "schránka: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Cieľový adresár:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -212,7 +213,7 @@ msgstr "Cieľový adresár:"
 msgid "Change"
 msgstr "Zmeniť"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -220,34 +221,34 @@ 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:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "požadovaný diskový priestor:"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 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:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Vložte cestu pre"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -274,41 +275,41 @@ msgstr "Vložte cestu pre"
 msgid "Ok"
 msgstr "OK"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Predvolený rozmer papiera"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "Pridať skratky ponuky"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Zmeniť priradenia súborov"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "Upraviť nastavenie PATH v registroch"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Inštalácia pre všetkých používateľov"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 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:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -321,7 +322,7 @@ 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:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -332,20 +333,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Áno"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -356,29 +357,29 @@ msgstr "Áno"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "Nie"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Nainštalovať"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -394,8 +395,8 @@ msgstr ""
 "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:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -408,8 +409,8 @@ msgstr ""
 "A čo je najdôležitejšie, pridajte %s/bin/%s\n"
 "do vašej cesty  PATH pre aktuálnu a nasledujúce relácie (spustenia)."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -417,18 +418,18 @@ 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:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Vitajte vo svete TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Dokončiť"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Žiaden"
@@ -458,8 +459,8 @@ msgstr "Načítať"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -496,13 +497,13 @@ msgid "Basic Information"
 msgstr "Základné informácie"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Binárny(e) systém(y)"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Zvolená schéma"
 
@@ -511,12 +512,12 @@ msgid "Further Customization"
 msgstr "Ďalšie prispôsobenie"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Štandardné zbierky"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Jazykové zbierky"
 
@@ -591,7 +592,7 @@ msgid "Install font/macro source tree"
 msgstr "Nainštalovať strom zdrojových súborov fontov/makier"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Vytvoriť symbolické odkazy v systémových adresároch"
 
@@ -607,100 +608,120 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "Nainštalovať TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Proces inštalácie"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Zmeniť hodnotu premennej"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, 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:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "používateľská voľba zbierok"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Zvoliť kolekcie, ktore majú byť nainštalované."
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Zvoliť všetky"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Zrušiť všetky voľby"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Zvoliť podporu jazyka"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Zvoliť dokumentáciu pre jednotlivé jazyky"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: 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:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "binárky do"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "dokumentáciu manpages do"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "informáciu do"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Zvoliť architektúru resp. operačný systém"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr "Odstránenie hlavnej platformy nie je možné!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcií z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(nebola zvolená jazyková kolekcia!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(zmeňte najprv TEXDIR, prosím!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(predvolené miesto neumožňuje zápis - zmeňte, prosím!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1741,6 +1762,29 @@ msgstr "programy podporujúce Windows"
 msgid "XeTeX packages"
 msgstr "Balíky XeTeXu"
 
+#~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Vitajte pri inštalácii systému TeX Live %s\n"
+#~ " http://tug.org/texlive\n"
+#~ "\n"
+#~ "Tento sprievodca vás bude sprevádzať počas inštalácie.\n"
+#~ "\n"
+#~ "O pokročilej prispôsobiteľnej inštalácii sa, prosim, informujte\n"
+#~ " na webových stránkach alebo v inštalačnej príručke."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Prípadne  použite install-tl-advanced.bat"
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "Použite prípadne argument --gui expert príkazu install-tl."
+
 #~ msgid "After install, use tlnet on CTAN for package updates"
 #~ msgstr "Po inštalácii použite tlnet na CTANe na aktualizáciu balíka"
 
diff --git a/Master/tlpkg/translations/sl.po b/Master/tlpkg/translations/sl.po
index b395b3088ac..87086542d66 100644
--- a/Master/tlpkg/translations/sl.po
+++ b/Master/tlpkg/translations/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2012-05-28 11:24+0100\n"
 "Last-Translator: Mojca Miklavec <mojca.miklavec.lists@gmail.com>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -15,33 +15,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Namestitev TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Izhod"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Nazaj"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Nazaj"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Naprej >"
 
@@ -53,47 +55,45 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Dobrodošli pri namestitvi TeX Live %s\n"
-"http://tug.org/texlive\n"
-"\n"
-"Ta čarovnik vas bo vodil skozi namestitev.\n"
-"\n"
-"Za napredne dodatne nastavitve se obrnite na\n"
-"spletno stran ali namestitveni vodič (installation guide)."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Lahko uporabite install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-#, fuzzy
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Lahko uporabite opcijo --gui expert za install-tl."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "Zamenjaj privzeti repozitorij"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 #, fuzzy
 msgid "Command line repository"
 msgstr "Repozitorij za uporabo v ukazni vrstici"
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "LOKALNI REPOZITORIJI"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "MREŽNI REPOZITORIJI"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
@@ -101,48 +101,48 @@ msgstr "MREŽNI REPOZITORIJI"
 msgid "Default remote repository"
 msgstr "Privzeti spletni repozitorij"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "Izberi repozitorij"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "Zrcalni strežnik:"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "Kontinent"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "Države"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "Zrcalni strežniki"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 #, 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:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "To utegne trajati nekaj časa."
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -160,19 +160,19 @@ msgstr "To utegne trajati nekaj časa."
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 #, 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:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 #, 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:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -184,12 +184,12 @@ msgstr ""
 "nameščena verzija: %s\n"
 "verzija na strežniku: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Ciljni imenik:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -217,7 +217,7 @@ msgstr "Ciljni imenik:"
 msgid "Change"
 msgstr "Spremeni"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 #, fuzzy
 msgid ""
 "The destination folder will contain the installation.\n"
@@ -226,33 +226,33 @@ msgstr ""
 "Namestitev bo opravljena v ciljni imenik.\n"
 "Priporočljivo je uporabiti letnico na koncu imena."
 
-#: tlpkg/installer/install-menu-wizard.pl:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 #, fuzzy
 msgid "disk space required:"
 msgstr "prostor na disku:"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 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:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Nastavite pot do"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -279,21 +279,21 @@ msgstr "Nastavite pot do"
 msgid "Ok"
 msgstr "V redu"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Privzet format papirja"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 #, fuzzy
 msgid "Add menu shortcuts"
 msgstr "Dodajne menijske bližnjice"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
@@ -301,22 +301,22 @@ msgstr "Dodajne menijske bližnjice"
 msgid "Change file associations"
 msgstr "Spremeni asociacije končnic datotek"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 #, fuzzy
 msgid "Adjust PATH setting in registry"
 msgstr "Nastavi pot (PATH) v registru"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Namestitev za vse uporabnike"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr "Ta zaslon omogoča nastavitev nekaterih opcij"
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -329,7 +329,7 @@ msgstr ""
 "Če bi radi karkoli spremenili, se vrnite nazaj,\n"
 "sicer pritisnite gumb \"Namesti\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -340,20 +340,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Da"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -364,29 +364,29 @@ msgstr "Da"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "Ne"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Namesti"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -402,8 +402,8 @@ msgstr ""
 "Seznam društev uporabnikov TeX-a je na voljo na http://tug.org/usergroups."
 "html."
 
-#: tlpkg/installer/install-menu-wizard.pl:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, fuzzy, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -416,8 +416,8 @@ msgstr ""
 "%s/texmf/doc/info v spremenljivko INFOPATH ter najpomembneje -\n"
 "%s/bin/%s v spremenljivko PATH."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 #, fuzzy
 msgid ""
 "There were some warnings during the installation process.\n"
@@ -426,18 +426,18 @@ msgstr ""
 "Med namestitvijo je prišlo do manjših težav.\n"
 "Tu je seznam opozoril:"
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Dobrodošli v TeX Live-u!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Konec"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 #, fuzzy
 msgid "None"
@@ -468,8 +468,8 @@ msgstr "Naloži"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -506,13 +506,13 @@ msgid "Basic Information"
 msgstr "Osnovne nastavitve"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Izbrani operacijski sistemi in arhitekture"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Izbrana shema"
 
@@ -521,12 +521,12 @@ msgid "Further Customization"
 msgstr "Napredne nastavitve"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Standardne zbirke"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Podpora jezikom"
 
@@ -599,7 +599,7 @@ msgid "Install font/macro source tree"
 msgstr "Namesti izvorno kodo za pisave in makre"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Namesti simbolne povezave v sistemske mape"
 
@@ -615,103 +615,123 @@ msgstr "Po namestitvi prenesi posodobitve iz CTAN-a"
 msgid "Install TeX Live"
 msgstr "Namesti TeX Live"
 
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
 # 1. zavihek
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 #, fuzzy
 msgid "Installation process"
 msgstr "Potek namestitve"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Nova vrednost spremenljivke"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, 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:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "namestitev paketov po izbiri"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Zbirke, ki naj se namestijo"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Briši izbor"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Jezikovni paketi in delilni vzorci"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Prevodi dokumentacije"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: 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:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "binarne datoteke v"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "'man' strani v"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "info strani v"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Izbrane platforme"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 #, 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:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s od %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s zbirk od %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(Nobena jezikovna zbirka ni izbrana!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(Spremenite TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(Spremenite imenik - pisanje v izbrani imenik je zaščiteno!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1808,3 +1828,27 @@ msgstr "Dodatni programi za Okna"
 #: tlpkg/translations/shortdesc.pl:94
 msgid "XeTeX packages"
 msgstr "Paketi za XeTeX"
+
+#~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Dobrodošli pri namestitvi TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Ta čarovnik vas bo vodil skozi namestitev.\n"
+#~ "\n"
+#~ "Za napredne dodatne nastavitve se obrnite na\n"
+#~ "spletno stran ali namestitveni vodič (installation guide)."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Lahko uporabite install-tl-advanced.bat"
+
+#, fuzzy
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "Lahko uporabite opcijo --gui expert za install-tl."
diff --git a/Master/tlpkg/translations/sr.po b/Master/tlpkg/translations/sr.po
index 7b58c380465..eafc15136f7 100644
--- a/Master/tlpkg/translations/sr.po
+++ b/Master/tlpkg/translations/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+0200\n"
 "PO-Revision-Date: 2012-05-25 19:06+0400\n"
 "Last-Translator: Nikola Lečić <nikola.lecic@anthesphoria.net>\n"
 "Language-Team: Serbian/Cyrillic <tex-live@tug.org>\n"
@@ -18,33 +18,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s: инсталација"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Напусти програм"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Назад"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Назад"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Напред >"
 
@@ -56,92 +58,91 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"TeX Live %s: Добродошли у инсталацију\n"
-"http://tug.org/texlive\n"
-"\n"
-"Овај програм ће Вас провести кроз процес инсталације.\n"
-"\n"
-"Ако желите напредну инсталацију са више могућности подешавања,\n"
-"погледајте странице на Интернету или Приручник."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Можете да употребите и install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Или, позовите скрипту install-tl са параметром --gui expert."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "Промена подразумеваног репозиторијума"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr "Репозиторијум са командне линије"
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "ЛОКАЛНИ РЕПОЗИТОРИЈУМИ"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "МРЕЖНИ РЕПОЗИТОРИЈУМИ"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Подразумевани удаљени репозиторијум"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "Изаберите репозиторијум"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "Огледало (mirror):"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "Континент"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "Државе"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "Огледала (mirrors)"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr "Сачекајте док се не учита база података са репозиторијума."
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "Ово ће потрајати неко време!"
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -159,17 +160,17 @@ msgstr "Ово ће потрајати неко време!"
 msgid "Cancel"
 msgstr "Прекини"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr "Учитавање удаљене TeX Live базе података није успело:"
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 msgid "Please go back and select a different mirror."
 msgstr "Вратите се назад и изаберите друго огледало (mirror)."
 
-#: tlpkg/installer/install-menu-wizard.pl:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -182,12 +183,12 @@ msgstr ""
 "          локална верзија: %s\n"
 "верзија са репозиторијума: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Циљни директоријум:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -215,7 +216,7 @@ msgstr "Циљни директоријум:"
 msgid "Change"
 msgstr "Промени"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -223,32 +224,32 @@ msgstr ""
 "Директоријум у који ће се сместити инсталирани материјал.\n"
 "Препоручујемо да задржите годину као последњи члан."
 
-#: tlpkg/installer/install-menu-wizard.pl:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "потребан простор на диску:"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(подразумевани директоријум је неуписив - промените га!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Унесите путању за"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -275,41 +276,41 @@ msgstr "Унесите путању за"
 msgid "Ok"
 msgstr "У реду"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Подразумевана величина папира"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "Додати пречице у менију"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Повежи типове фајлова са одговарајућим програмима"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "Подеси PATH вредност у Registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "Инсталација за све кориснике"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr "На овом екрану можете да подесите неке параметре"
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -322,7 +323,7 @@ msgstr ""
 "Ако желите да нешто промените, вратите се назад,\n"
 "иначе притисните дугме „Инсталирај“."
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -333,20 +334,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "да"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -357,29 +358,29 @@ msgstr "да"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "не"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Инсталирај"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -395,8 +396,8 @@ msgstr ""
 "подршке путем прикључивања групи која Вам највише одговара. Списак група "
 "налази се на Интернет-страници http://tug.org/usergroups.html."
 
-#: tlpkg/installer/install-menu-wizard.pl:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -409,8 +410,8 @@ msgstr ""
 "Најважније од свега, додајте %s/bin/%s\n"
 "у PATH путању за тренутну и све будуће сесије."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -418,18 +419,18 @@ msgstr ""
 "Било је неких упозорења током инсталационог процеса.\n"
 "Следи преглед тих порука:"
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Добродошли у TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Заврши"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Ништа"
@@ -459,8 +460,8 @@ msgstr "Учитај"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -497,13 +498,13 @@ msgid "Basic Information"
 msgstr "Основни подаци"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Платформе (архитектуре и оперативни системи)"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Изабрана шема"
 
@@ -512,12 +513,12 @@ msgid "Further Customization"
 msgstr "Додатна подешавања"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Стандардне колекције"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Језичке колекције"
 
@@ -590,7 +591,7 @@ msgid "Install font/macro source tree"
 msgstr "Инсталирај изворни код фонтова и макроа"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Направи симболичке линкове у системским директоријумима"
 
@@ -606,102 +607,122 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "Инсталирај TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Процес инсталације"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Промена вредности променљиве"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Унесите путању за %s (употребите ~ као замену за %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "произвољан избор колекција"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Изаберите колекције које ће бити инсталиране"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Изабери све"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Уклони све ознаке"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Изаберите језичку подршку"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Изаберите превод документације"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "Направи симболичке линкове у стандардним директоријумима"
 
-#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "Стави бинарне фајлове у"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "Стави man странице у"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "Стави info странице у"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr ""
 "Изаберите платформу\n"
 "(архитектура - оперативни систем)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr "Уклањање главне платформе није могуће!"
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s од укупно %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s колекција од укупно %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(није одабрана ниједна језичка колекција!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(прво промените TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(није могуће уписивање на подразумевану локацију - промените је!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1742,6 +1763,29 @@ msgstr "Програми за рад на Windows-у"
 msgid "XeTeX packages"
 msgstr "XeTeX пакети"
 
+#~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "TeX Live %s: Добродошли у инсталацију\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Овај програм ће Вас провести кроз процес инсталације.\n"
+#~ "\n"
+#~ "Ако желите напредну инсталацију са више могућности подешавања,\n"
+#~ "погледајте странице на Интернету или Приручник."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Можете да употребите и install-tl-advanced.bat"
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "Или, позовите скрипту install-tl са параметром --gui expert."
+
 #~ msgid "After install, use tlnet on CTAN for package updates"
 #~ msgstr ""
 #~ "После инсталације користите tlnet или CTAN за освежавање инсталираних "
diff --git a/Master/tlpkg/translations/vi.po b/Master/tlpkg/translations/vi.po
index 6162cce934e..dc32b149c39 100644
--- a/Master/tlpkg/translations/vi.po
+++ b/Master/tlpkg/translations/vi.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+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"
@@ -17,33 +17,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Cài đặt TeX Live %s"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "Thoát"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< Quay lại"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< Quay lại"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "Tiếp theo >"
 
@@ -55,92 +57,91 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"Chào mừng bạn đến với cài đặt TeX Live %s\n"
-"http://tug.org/texlive\n"
-"\n"
-"Bộ cài đặt này sẽ hướng dẫn bạn từng bước trong quá trình cài đặt.\n"
-"\n"
-"Với người dùng cap cấp, việc thay đổi trình cài đặt có thể được thực hiện "
-"theo trang web hoặc hướng dẫn cài đặt."
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "Hoặc cài đặt với các tùy chỉnh nâng cao nhờ install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "Hoặc dùng tham số --gui expert để cài texlive."
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr "Thay đổi nguồn mặc định"
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr "Nguồn bằng dòng lệnh"
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr "NGUỒN TRÊN MÁY"
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr "NGUỒN TỪ MẠNG"
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "Nguồn cài đặt mặc định từ internet"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr "Chọn nguồn"
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr "Mirror:"
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr "Lục địa"
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr "Nước"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr "Mirros"
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 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:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr "Sẽ tốn ít thời gian!"
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -158,17 +159,17 @@ msgstr "Sẽ tốn ít thời gian!"
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 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:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 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:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -181,12 +182,12 @@ msgstr ""
 "      trên máy: %s\n"
 "nguồn cài đặt: %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "Cài đặt vào thư mục:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -214,7 +215,7 @@ msgstr "Cài đặt vào thư mục:"
 msgid "Change"
 msgstr "Thay đổi"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -223,32 +224,32 @@ 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:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 msgid "disk space required:"
 msgstr "dung lượng đĩa cần thiết:"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 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:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "Nhập đường dẫn cho"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -275,41 +276,41 @@ msgstr "Nhập đường dẫn cho"
 msgid "Ok"
 msgstr "Đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr "Kiểu giấy mặc định"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr "Thêm liên kết nhanh vào menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "Đổi tương ứng tập tin - chương trình"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 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:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 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:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 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:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -322,7 +323,7 @@ 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:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -333,20 +334,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "Đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -357,29 +358,29 @@ msgstr "Đồng ý"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "Không đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "Cài đặt"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -395,8 +396,8 @@ msgstr ""
 "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:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -409,8 +410,8 @@ msgstr ""
 "Quan trọng nhất, thêm %s/bin/%s\n"
 "vào đường dẫn đến tập tin thi hành (PATH) để sử dụng cho cả sau này."
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -418,18 +419,18 @@ 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:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "Chào mừng đến với TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "Kết thúc"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "Không"
@@ -459,8 +460,8 @@ msgstr "Nạp"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -496,13 +497,13 @@ msgid "Basic Information"
 msgstr "Thông tin cơ bản"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "Hệ thống nhị phân"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "Nhóm đã chọn"
 
@@ -511,12 +512,12 @@ msgid "Further Customization"
 msgstr "Tùy chỉnh khác"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "Các tập hợp chuẩn"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "Các bộ ngôn ngữ"
 
@@ -593,7 +594,7 @@ msgid "Install font/macro source tree"
 msgstr "Cài đặt mã nguồn của font/macro"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "Tạo liên kết vào các thư mục hệ thống"
 
@@ -609,100 +610,120 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "Cài đặt TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "Tiến trình cài đặt"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "Đổi giá trị biến"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, 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:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr "tự chọn các nhóm"
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "Chọn nhóm sẽ được cài đặt"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "Chọn tất cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "Không chọn gì cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "Chọn ngôn ngữ hỗ trợ"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "Chọn tài liệu ứng với ngôn ngữ"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: 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:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "tập tin thi hành vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "tập tin hướng dẫn (man) vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "tập tin hướng dẫn (info) vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "Chọn kiểu hệ thống"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 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:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s trên %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s nhóm trong tổng số %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(chưa chọn nhóm ngôn ngữ nào!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(vui lòng đổi thư mục TEXDIR trước!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(mặc định không ghi được - vui lòng đổi!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1740,6 +1761,29 @@ msgstr "Hỗ trợ cho Windows"
 msgid "XeTeX packages"
 msgstr "Các gói cho XeTeX"
 
+#~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "Chào mừng bạn đến với cài đặt TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "Bộ cài đặt này sẽ hướng dẫn bạn từng bước trong quá trình cài đặt.\n"
+#~ "\n"
+#~ "Với người dùng cap cấp, việc thay đổi trình cài đặt có thể được thực hiện "
+#~ "theo trang web hoặc hướng dẫn cài đặt."
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "Hoặc cài đặt với các tùy chỉnh nâng cao nhờ install-tl-advanced.bat"
+
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "Hoặc dùng tham số --gui expert để cài texlive."
+
 #~ msgid "After install, use tlnet on CTAN for package updates"
 #~ msgstr "Sau khi cài, dùng tlnet trên CTAN để cập nhật gói"
 
diff --git a/Master/tlpkg/translations/zh-cn.po b/Master/tlpkg/translations/zh-cn.po
index 1ed8d4e5bc9..a49f71b5ed2 100644
--- a/Master/tlpkg/translations/zh-cn.po
+++ b/Master/tlpkg/translations/zh-cn.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+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"
@@ -14,33 +14,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s 安装"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "退出"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr "< 上一步"
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr "< 上一步"
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr "下一步 >"
 
@@ -52,92 +54,91 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
-"欢迎使用 TeX Live %s 的安装程序\n"
-"http://tug.org/texlive\n"
-"\n"
-"这个向导将引导你完成整个安装。\n"
-"\n"
-"要使用更强大、可定制的安装，请参考网页或安装指南。"
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
-msgstr "或者使用 install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
+msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-#, fuzzy
-msgid "Or use the argument --gui expert to install-tl."
-msgstr "或者使用 install-tl 的 --gui perltk 参数。"
+msgid "Best to turn off your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr "缺省的网络软件包仓库"
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -155,17 +156,17 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 msgid "Please go back and select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -174,12 +175,12 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr "目的文件夹:"
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -207,7 +208,7 @@ msgstr "目的文件夹:"
 msgid "Change"
 msgstr "修改"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -215,33 +216,33 @@ msgstr ""
 "将包含整个安装的目的文件夹。\n"
 "强烈建议以年份作为最后的目录项。"
 
-#: tlpkg/installer/install-menu-wizard.pl:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 #, fuzzy
 msgid "disk space required:"
 msgstr "需要的磁盘空间"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "输入路径变量"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -268,42 +269,42 @@ msgstr "输入路径变量"
 msgid "Ok"
 msgstr "确定"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 #, fuzzy
 msgid "Default paper size"
 msgstr "缺省的纸张给"
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr "修改文件关联"
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr "修改注册表中的 PATH 设置"
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 msgid "Installation for all users"
 msgstr "为所有用户安装"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr "这个界面允许你配置某些选项"
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -315,7 +316,7 @@ msgstr ""
 "将使用下列选项。\n"
 "如果你还想修改什么请后退，否则点击“安装”按钮。"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -326,20 +327,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "是"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -350,29 +351,29 @@ msgstr "是"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 msgid "Install"
 msgstr "安装"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -387,8 +388,8 @@ msgstr ""
 "请考虑加入合适的 TeX 用户组来支持该项目。从\n"
 "http://tug.org/usergroups.html 可以获得 TeX 用户组的列表。"
 
-#: tlpkg/installer/install-menu-wizard.pl:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -401,25 +402,25 @@ msgstr ""
 "最为重要的是，请添加 %s/bin/%s\n"
 "到你的 PATH 变量。"
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "欢迎进入 TeX Live 的世界！"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "完成"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 msgid "None"
 msgstr "无"
@@ -449,8 +450,8 @@ msgstr "载入"
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -482,13 +483,13 @@ msgid "Basic Information"
 msgstr "基本信息"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "二进制系统"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "选择安装方案"
 
@@ -497,12 +498,12 @@ msgid "Further Customization"
 msgstr "进一步定制"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "标准安装"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "语言集合"
 
@@ -575,7 +576,7 @@ msgid "Install font/macro source tree"
 msgstr "安装字体/宏包源码目录树"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "创建指向系统目录的符号链接"
 
@@ -591,101 +592,121 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "安装 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 msgid "Installation process"
 msgstr "安装过程"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "更改变量的值"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "输入 %s 对应的路径 (使用 ~ 作为 %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "选择要安装的组件"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "全部选择"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "取消全部选择"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "选择语言支持"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "选择相关语言的文档"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "在标准位置创建符号链接"
 
-#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "程序文件安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "手册文档(*.man)安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "超文本文档(*.info)安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "选择系统架构"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 #, fuzzy
 msgid "Removals of the main platform not possible!"
 msgstr "不可能删除主架构文件！"
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s  来自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s 集合来自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(没有选择语言集合！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(请首先改变 TEXDIR ！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(默认位置不可写 - 请做相应更改！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1712,6 +1733,29 @@ msgid "XeTeX packages"
 msgstr ""
 
 #~ msgid ""
+#~ "Welcome to the installation of TeX Live %s\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "This wizard will guide you through the installation.\n"
+#~ "\n"
+#~ "For an advanced, customizable installation, please consult\n"
+#~ "the web pages or installation guide."
+#~ msgstr ""
+#~ "欢迎使用 TeX Live %s 的安装程序\n"
+#~ "http://tug.org/texlive\n"
+#~ "\n"
+#~ "这个向导将引导你完成整个安装。\n"
+#~ "\n"
+#~ "要使用更强大、可定制的安装，请参考网页或安装指南。"
+
+#~ msgid "Or use install-tl-advanced.bat"
+#~ msgstr "或者使用 install-tl-advanced.bat"
+
+#, fuzzy
+#~ msgid "Or use the argument --gui expert to install-tl."
+#~ msgstr "或者使用 install-tl 的 --gui perltk 参数。"
+
+#~ msgid ""
 #~ "Loading local TeX Live Database\n"
 #~ "This may take some time, please wait!"
 #~ msgstr ""
diff --git a/Master/tlpkg/translations/zh-tw.po b/Master/tlpkg/translations/zh-tw.po
index 97caf7b0e3d..267e3c095cf 100644
--- a/Master/tlpkg/translations/zh-tw.po
+++ b/Master/tlpkg/translations/zh-tw.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2012-05-27 04:38+0200\n"
+"POT-Creation-Date: 2012-06-01 04:35+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"
@@ -14,33 +14,35 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:150
 #: tlpkg/installer/install-menu-perltk.pl:248
+#: tlpkg/installer/install-menu-perltk.pl:564
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s 安裝"
 
 #: tlpkg/installer/install-menu-wizard.pl:165
 #: tlpkg/installer/install-menu-perltk.pl:518
+#: tlpkg/installer/install-menu-perltk.pl:577
 #: texmf/scripts/texlive/tlmgrgui.pl:526
 msgid "Quit"
 msgstr "退出"
 
 #: tlpkg/installer/install-menu-wizard.pl:167
-#: tlpkg/installer/install-menu-wizard.pl:279
-#: tlpkg/installer/install-menu-wizard.pl:348
-#: tlpkg/installer/install-menu-wizard.pl:400
-#: tlpkg/installer/install-menu-wizard.pl:407
-#: tlpkg/installer/install-menu-wizard.pl:484
-#: tlpkg/installer/install-menu-wizard.pl:639
-#: tlpkg/installer/install-menu-wizard.pl:684
-msgid "< Back"
-msgstr ""
-
-#: tlpkg/installer/install-menu-wizard.pl:168
-#: tlpkg/installer/install-menu-wizard.pl:209
 #: tlpkg/installer/install-menu-wizard.pl:280
 #: tlpkg/installer/install-menu-wizard.pl:349
+#: tlpkg/installer/install-menu-wizard.pl:401
+#: tlpkg/installer/install-menu-wizard.pl:408
 #: tlpkg/installer/install-menu-wizard.pl:485
 #: tlpkg/installer/install-menu-wizard.pl:640
+#: tlpkg/installer/install-menu-wizard.pl:685
+msgid "< Back"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:210
+#: tlpkg/installer/install-menu-wizard.pl:281
+#: tlpkg/installer/install-menu-wizard.pl:350
+#: tlpkg/installer/install-menu-wizard.pl:486
+#: tlpkg/installer/install-menu-wizard.pl:641
 msgid "Next >"
 msgstr ""
 
@@ -52,85 +54,91 @@ msgid ""
 "\n"
 "This wizard will guide you through the installation.\n"
 "\n"
+"Best to turn off your virus scanner during installation.\n"
+"\n"
 "For an advanced, customizable installation, please consult\n"
 "the web pages or installation guide."
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:193
-msgid "Or use install-tl-advanced.bat"
+msgid "Or use install-tl-advanced.bat."
 msgstr ""
 
 #: tlpkg/installer/install-menu-wizard.pl:194
-msgid "Or use the argument --gui expert to install-tl."
+msgid "Best to turn off your virus scanner during installation."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:203
+#: tlpkg/installer/install-menu-wizard.pl:195
+msgid "Or specify  --gui expert  to install-tl."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:204
 msgid "Change default repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:240
+#: tlpkg/installer/install-menu-wizard.pl:241
 #: tlpkg/installer/install-menu-perltk.pl:261
 msgid "Command line repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:246
+#: tlpkg/installer/install-menu-wizard.pl:247
 #: tlpkg/installer/install-menu-perltk.pl:267
 msgid "LOCAL REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:250
+#: tlpkg/installer/install-menu-wizard.pl:251
 #: tlpkg/installer/install-menu-perltk.pl:271
 msgid "NETWORK REPOSITORIES"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:251
+#: tlpkg/installer/install-menu-wizard.pl:252
 #: tlpkg/installer/install-menu-perltk.pl:272
 #: texmf/scripts/texlive/tlmgrgui.pl:1464
 #: texmf/scripts/texlive/tlmgrgui.pl:1496
 msgid "Default remote repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:257
+#: tlpkg/installer/install-menu-wizard.pl:258
 #: tlpkg/installer/install-menu-perltk.pl:276
 msgid "Select repository"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:259
+#: tlpkg/installer/install-menu-wizard.pl:260
 msgid "Mirror:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:311
+#: tlpkg/installer/install-menu-wizard.pl:312
 msgid "Continent"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:325
+#: tlpkg/installer/install-menu-wizard.pl:326
 msgid "Countries"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:344
 msgid "Mirrors"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:390
+#: tlpkg/installer/install-menu-wizard.pl:391
 msgid "Please wait while the repository database is loaded."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:391
+#: tlpkg/installer/install-menu-wizard.pl:392
 msgid "This will take some time!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:394
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-wizard.pl:731
-#: tlpkg/installer/install-menu-perltk.pl:571
-#: tlpkg/installer/install-menu-perltk.pl:655
-#: tlpkg/installer/install-menu-perltk.pl:687
-#: tlpkg/installer/install-menu-perltk.pl:725
-#: tlpkg/installer/install-menu-perltk.pl:769
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:907
-#: tlpkg/installer/install-menu-perltk.pl:971
-#: tlpkg/installer/install-menu-perltk.pl:1002
+#: tlpkg/installer/install-menu-wizard.pl:395
+#: tlpkg/installer/install-menu-wizard.pl:518
+#: tlpkg/installer/install-menu-wizard.pl:732
+#: tlpkg/installer/install-menu-perltk.pl:601
+#: tlpkg/installer/install-menu-perltk.pl:685
+#: tlpkg/installer/install-menu-perltk.pl:717
+#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:799
+#: tlpkg/installer/install-menu-perltk.pl:853
+#: tlpkg/installer/install-menu-perltk.pl:937
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #: texmf/scripts/texlive/tlmgrgui.pl:611 texmf/scripts/texlive/tlmgrgui.pl:612
 #: texmf/scripts/texlive/tlmgrgui.pl:1039
 #: texmf/scripts/texlive/tlmgrgui.pl:1251
@@ -148,17 +156,17 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-#: tlpkg/installer/install-menu-wizard.pl:398
+#: tlpkg/installer/install-menu-wizard.pl:399
 #: tlpkg/installer/install-menu-perltk.pl:302
 msgid "Could not load remote TeX Live Database:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:399
-#: tlpkg/installer/install-menu-wizard.pl:406
+#: tlpkg/installer/install-menu-wizard.pl:400
+#: tlpkg/installer/install-menu-wizard.pl:407
 msgid "Please go back and select a different mirror."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:402
+#: tlpkg/installer/install-menu-wizard.pl:403
 #, perl-format
 msgid ""
 "The TeX Live versions of the local installation\n"
@@ -167,12 +175,12 @@ msgid ""
 "repository: %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:434
-#: tlpkg/installer/install-menu-wizard.pl:665
+#: tlpkg/installer/install-menu-wizard.pl:435
+#: tlpkg/installer/install-menu-wizard.pl:666
 msgid "Destination folder:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:436
+#: tlpkg/installer/install-menu-wizard.pl:437
 #: tlpkg/installer/install-menu-perltk.pl:336
 #: tlpkg/installer/install-menu-perltk.pl:345
 #: tlpkg/installer/install-menu-perltk.pl:355
@@ -200,39 +208,39 @@ msgstr ""
 msgid "Change"
 msgstr "改變"
 
-#: tlpkg/installer/install-menu-wizard.pl:458
+#: tlpkg/installer/install-menu-wizard.pl:459
 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:480
-#: tlpkg/installer/install-menu-perltk.pl:1056
+#: tlpkg/installer/install-menu-wizard.pl:481
+#: tlpkg/installer/install-menu-perltk.pl:1086
 #, fuzzy
 msgid "disk space required:"
 msgstr "需要的磁碟空間"
 
-#: tlpkg/installer/install-menu-wizard.pl:500
-#: tlpkg/installer/install-menu-perltk.pl:1070
+#: tlpkg/installer/install-menu-wizard.pl:501
+#: tlpkg/installer/install-menu-perltk.pl:1100
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:510
+#: tlpkg/installer/install-menu-wizard.pl:511
 msgid "Enter path for"
 msgstr "輸入路徑變數"
 
-#: tlpkg/installer/install-menu-wizard.pl:514
+#: tlpkg/installer/install-menu-wizard.pl:515
 #: tlpkg/installer/install-menu-perltk.pl:305
 #: tlpkg/installer/install-menu-perltk.pl:313
-#: tlpkg/installer/install-menu-perltk.pl:654
-#: tlpkg/installer/install-menu-perltk.pl:685
-#: tlpkg/installer/install-menu-perltk.pl:710
-#: tlpkg/installer/install-menu-perltk.pl:767
-#: tlpkg/installer/install-menu-perltk.pl:807
-#: tlpkg/installer/install-menu-perltk.pl:891
-#: tlpkg/installer/install-menu-perltk.pl:969
-#: tlpkg/installer/install-menu-perltk.pl:1000
-#: tlpkg/installer/install-menu-perltk.pl:1017
+#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:715
+#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:797
+#: tlpkg/installer/install-menu-perltk.pl:837
+#: tlpkg/installer/install-menu-perltk.pl:921
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1030
+#: tlpkg/installer/install-menu-perltk.pl:1047
 #: texmf/scripts/texlive/tlmgrgui.pl:238 texmf/scripts/texlive/tlmgrgui.pl:611
 #: texmf/scripts/texlive/tlmgrgui.pl:615 texmf/scripts/texlive/tlmgrgui.pl:617
 #: texmf/scripts/texlive/tlmgrgui.pl:635 texmf/scripts/texlive/tlmgrgui.pl:814
@@ -259,42 +267,42 @@ msgstr "輸入路徑變數"
 msgid "Ok"
 msgstr "確定"
 
-#: tlpkg/installer/install-menu-wizard.pl:570
+#: tlpkg/installer/install-menu-wizard.pl:571
 #: tlpkg/installer/install-menu-perltk.pl:430
 msgid "Default paper size"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:571
+#: tlpkg/installer/install-menu-wizard.pl:572
 #: tlpkg/installer/install-menu-perltk.pl:472
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:572
+#: tlpkg/installer/install-menu-wizard.pl:573
 #: tlpkg/installer/install-menu-perltk.pl:478
-#: tlpkg/installer/install-menu-perltk.pl:696
-#: tlpkg/installer/install-menu-perltk.pl:701
+#: tlpkg/installer/install-menu-perltk.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:731
 #: texmf/scripts/texlive/tlmgrgui.pl:1232
 #: texmf/scripts/texlive/tlmgrgui.pl:1808
 #: texmf/scripts/texlive/tlmgrgui.pl:1812
 msgid "Change file associations"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:573
+#: tlpkg/installer/install-menu-wizard.pl:574
 #: tlpkg/installer/install-menu-perltk.pl:459
 msgid "Adjust PATH setting in registry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:574
+#: tlpkg/installer/install-menu-wizard.pl:575
 #: tlpkg/installer/install-menu-perltk.pl:485
 #, fuzzy
 msgid "Installation for all users"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-wizard.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:590
 msgid "This screen allows you to configure some options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:657
+#: tlpkg/installer/install-menu-wizard.pl:658
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -303,7 +311,7 @@ msgid ""
 "otherwise press the \"Install\" button."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -314,20 +322,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1206
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1236
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "Yes"
 msgstr "是"
 
-#: tlpkg/installer/install-menu-wizard.pl:673
+#: tlpkg/installer/install-menu-wizard.pl:674
 #: tlpkg/installer/install-menu-perltk.pl:123
 #: tlpkg/installer/install-menu-perltk.pl:125
 #: tlpkg/installer/install-menu-perltk.pl:126
@@ -338,30 +346,30 @@ msgstr "是"
 #: tlpkg/installer/install-menu-perltk.pl:132
 #: tlpkg/installer/install-menu-perltk.pl:133
 #: tlpkg/installer/install-menu-perltk.pl:134
-#: tlpkg/installer/install-menu-perltk.pl:1105
-#: tlpkg/installer/install-menu-perltk.pl:1106
-#: tlpkg/installer/install-menu-perltk.pl:1107
-#: tlpkg/installer/install-menu-perltk.pl:1113
-#: tlpkg/installer/install-menu-perltk.pl:1119
-#: tlpkg/installer/install-menu-perltk.pl:1196
-#: tlpkg/installer/install-menu-perltk.pl:1215
-#: tlpkg/installer/install-menu-perltk.pl:1216
-#: tlpkg/installer/install-menu-perltk.pl:1218
-#: tlpkg/installer/install-menu-perltk.pl:1234
+#: tlpkg/installer/install-menu-perltk.pl:1135
+#: tlpkg/installer/install-menu-perltk.pl:1136
+#: tlpkg/installer/install-menu-perltk.pl:1137
+#: tlpkg/installer/install-menu-perltk.pl:1143
+#: tlpkg/installer/install-menu-perltk.pl:1149
+#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1245
+#: tlpkg/installer/install-menu-perltk.pl:1246
+#: tlpkg/installer/install-menu-perltk.pl:1248
+#: tlpkg/installer/install-menu-perltk.pl:1264
 #: texmf/scripts/texlive/tlmgrgui.pl:682
 #: texmf/scripts/texlive/tlmgrgui.pl:1096
 #: texmf/scripts/texlive/tlmgrgui.pl:1710
 msgid "No"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-wizard.pl:682
+#: tlpkg/installer/install-menu-wizard.pl:683
 #: texmf/scripts/texlive/tlmgrgui.pl:438
 #, fuzzy
 msgid "Install"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-wizard.pl:737
-#: tlpkg/installer/install-menu-perltk.pl:579
+#: tlpkg/installer/install-menu-wizard.pl:738
+#: tlpkg/installer/install-menu-perltk.pl:609
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -376,8 +384,8 @@ msgstr ""
 "請考慮加入合適的TeX用戶組來支持該項目。從\n"
 "http://tug.org/usergroups.html 可以獲得TeX用戶組的列表。"
 
-#: tlpkg/installer/install-menu-wizard.pl:739
-#: tlpkg/installer/install-menu-perltk.pl:581
+#: tlpkg/installer/install-menu-wizard.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:611
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -390,25 +398,25 @@ msgstr ""
 "最為重要的是，請添加 %s/bin/%s\n"
 "到你的 PATH 變數。"
 
-#: tlpkg/installer/install-menu-wizard.pl:742
-#: tlpkg/installer/install-menu-perltk.pl:584
+#: tlpkg/installer/install-menu-wizard.pl:743
+#: tlpkg/installer/install-menu-perltk.pl:614
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:746
-#: tlpkg/installer/install-menu-perltk.pl:589
+#: tlpkg/installer/install-menu-wizard.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:619
 msgid "Welcome to TeX Live!"
 msgstr "歡迎進入 TeX Live 的世界！"
 
-#: tlpkg/installer/install-menu-wizard.pl:755
-#: tlpkg/installer/install-menu-perltk.pl:599
+#: tlpkg/installer/install-menu-wizard.pl:756
+#: tlpkg/installer/install-menu-perltk.pl:629
 msgid "Finish"
 msgstr "完成"
 
 #: tlpkg/installer/install-menu-perltk.pl:56
-#: tlpkg/installer/install-menu-perltk.pl:1217
+#: tlpkg/installer/install-menu-perltk.pl:1247
 #: texmf/scripts/texlive/tlmgrgui.pl:144
 #, fuzzy
 msgid "None"
@@ -439,8 +447,8 @@ msgstr ""
 
 #: tlpkg/installer/install-menu-perltk.pl:301
 #: tlpkg/installer/install-menu-perltk.pl:308
-#: tlpkg/installer/install-menu-perltk.pl:1015
-#: tlpkg/installer/install-menu-perltk.pl:1225
+#: tlpkg/installer/install-menu-perltk.pl:1045
+#: tlpkg/installer/install-menu-perltk.pl:1255
 #: texmf/scripts/texlive/tlmgrgui.pl:236
 #: texmf/scripts/texlive/tlmgrgui.pl:1049
 #: texmf/scripts/texlive/tlmgrgui.pl:1640
@@ -472,13 +480,13 @@ msgid "Basic Information"
 msgstr "基本資訊"
 
 #: tlpkg/installer/install-menu-perltk.pl:333
-#: tlpkg/installer/install-menu-perltk.pl:980
+#: tlpkg/installer/install-menu-perltk.pl:1010
 msgid "Binary system(s)"
 msgstr "二進位系統"
 
 #: tlpkg/installer/install-menu-perltk.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:733
-#: tlpkg/installer/install-menu-perltk.pl:747
+#: tlpkg/installer/install-menu-perltk.pl:763
+#: tlpkg/installer/install-menu-perltk.pl:777
 msgid "Selected scheme"
 msgstr "選擇安裝方案"
 
@@ -487,12 +495,12 @@ msgid "Further Customization"
 msgstr "進一步定制"
 
 #: tlpkg/installer/install-menu-perltk.pl:354
-#: tlpkg/installer/install-menu-perltk.pl:777
+#: tlpkg/installer/install-menu-perltk.pl:807
 msgid "Standard collections"
 msgstr "標準安裝"
 
 #: tlpkg/installer/install-menu-perltk.pl:359
-#: tlpkg/installer/install-menu-perltk.pl:830
+#: tlpkg/installer/install-menu-perltk.pl:860
 msgid "Language collections"
 msgstr "語言集合"
 
@@ -566,7 +574,7 @@ msgid "Install font/macro source tree"
 msgstr "安裝字體/巨集包源碼目錄樹"
 
 #: tlpkg/installer/install-menu-perltk.pl:460
-#: tlpkg/installer/install-menu-perltk.pl:946
+#: tlpkg/installer/install-menu-perltk.pl:976
 msgid "Create symlinks in system directories"
 msgstr "創建指向系統目錄的符號鏈結"
 
@@ -584,101 +592,121 @@ msgstr ""
 msgid "Install TeX Live"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:558
-#: tlpkg/installer/install-menu-perltk.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:565
+msgid "Best to disable your virus scanner during installation."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:569
+msgid ""
+"The installer does not have adminstrative permissions;\n"
+"so can only install for current user."
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:572
+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:578
+msgid "Continue"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:588
+#: tlpkg/installer/install-menu-perltk.pl:592
 #, fuzzy
 msgid "Installation process"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
-#: tlpkg/installer/install-menu-perltk.pl:671
+#: tlpkg/installer/install-menu-perltk.pl:670
+#: tlpkg/installer/install-menu-perltk.pl:701
 msgid "Change variable value"
 msgstr "更改變數的值"
 
-#: tlpkg/installer/install-menu-perltk.pl:643
-#: tlpkg/installer/install-menu-perltk.pl:681
+#: tlpkg/installer/install-menu-perltk.pl:673
+#: tlpkg/installer/install-menu-perltk.pl:711
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "輸入路徑變數 %s (使用 ~ 作為 %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:755
+#: tlpkg/installer/install-menu-perltk.pl:785
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:816
 msgid "Select the collections to be installed"
 msgstr "選擇要安裝的組件"
 
-#: tlpkg/installer/install-menu-perltk.pl:802
-#: tlpkg/installer/install-menu-perltk.pl:864
-#: tlpkg/installer/install-menu-perltk.pl:886
+#: tlpkg/installer/install-menu-perltk.pl:832
+#: tlpkg/installer/install-menu-perltk.pl:894
+#: tlpkg/installer/install-menu-perltk.pl:916
 msgid "Select All"
 msgstr "全部選擇"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
-#: tlpkg/installer/install-menu-perltk.pl:866
-#: tlpkg/installer/install-menu-perltk.pl:888
+#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:896
+#: tlpkg/installer/install-menu-perltk.pl:918
 msgid "Deselect All"
 msgstr "取消全部選擇"
 
-#: tlpkg/installer/install-menu-perltk.pl:835
+#: tlpkg/installer/install-menu-perltk.pl:865
 msgid "Select language support"
 msgstr "選擇語言支援"
 
-#: tlpkg/installer/install-menu-perltk.pl:836
+#: tlpkg/installer/install-menu-perltk.pl:866
 msgid "Select language-specific documentation"
 msgstr "選擇相關語言的文檔"
 
-#: tlpkg/installer/install-menu-perltk.pl:950
+#: tlpkg/installer/install-menu-perltk.pl:980
 msgid "create symlinks in standard directories"
 msgstr "在標準位置創建符號鏈結"
 
-#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:985
 msgid "binaries to"
 msgstr "程式檔安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:957
+#: tlpkg/installer/install-menu-perltk.pl:987
 msgid "manpages to"
 msgstr "手冊文檔(*.man)安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:959
+#: tlpkg/installer/install-menu-perltk.pl:989
 msgid "info to"
 msgstr "超文本文檔(*.info)安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:989
+#: tlpkg/installer/install-menu-perltk.pl:1019
 msgid "Select arch-os"
 msgstr "選擇系統架構"
 
-#: tlpkg/installer/install-menu-perltk.pl:1016
+#: tlpkg/installer/install-menu-perltk.pl:1046
 #: texmf/scripts/texlive/tlmgrgui.pl:1050
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1048
+#: tlpkg/installer/install-menu-perltk.pl:1078
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s 來自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1054
+#: tlpkg/installer/install-menu-perltk.pl:1084
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s 集合來自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:1065
+#: tlpkg/installer/install-menu-perltk.pl:1095
 msgid "(no language collection selected!)"
 msgstr "(沒有選擇語言集合！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1109
+#: tlpkg/installer/install-menu-perltk.pl:1120
 msgid "(please change TEXDIR first!)"
 msgstr "(請首先改變 TEXDIR ！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1082
-#: tlpkg/installer/install-menu-perltk.pl:1093
+#: tlpkg/installer/install-menu-perltk.pl:1112
+#: tlpkg/installer/install-menu-perltk.pl:1123
 msgid "(default not writable - please change!)"
 msgstr "(默認位置不可寫 - 請做相應更改！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1226
+#: tlpkg/installer/install-menu-perltk.pl:1256
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"