autoupdate via tl-update-messages

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

16 files changed, 4599 insertions, 3454 deletions

diff --git a/Master/tlpkg/translations/cs.po b/Master/tlpkg/translations/cs.po
index 0095f926443..3835f925941 100644
--- a/Master/tlpkg/translations/cs.po
+++ b/Master/tlpkg/translations/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2009 Translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+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"
@@ -12,24 +12,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalace TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -45,21 +46,26 @@ msgstr "Instalace TeX Live %s"
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Předcházející"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Další >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -79,33 +85,74 @@ msgstr ""
 "je k dispozici na webových stránkách nebo\n"
 "v pokynech k instalaci."
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "Nebo použijte install-tl-advance.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: 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."
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Cílová složka:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -120,7 +167,7 @@ msgstr "Cílová složka:"
 msgid "Change"
 msgstr "Změnit"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -128,31 +175,32 @@ 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:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 #, fuzzy
 msgid "disk space required:"
 msgstr "vyžadované místo na disku"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Zadat cestu pro"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -176,42 +224,42 @@ msgstr "Zadat cestu pro"
 msgid "Ok"
 msgstr "OK"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 #, fuzzy
 msgid "Default paper size"
 msgstr "Výchozí papír pro"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Změna asociace typů souborů k programům"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "Upravení settingu PATH v registrech"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Instalace pro všechny uživatele"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 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:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -224,62 +272,62 @@ 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:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Ano"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "Ne"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Nainstaluj"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -295,8 +343,8 @@ msgstr ""
 "vyhovuje.\n"
 "Seznam sdružení je dostupný na http://tug.org/usergroups.html."
 
-#: tlpkg/installer/install-menu-wizard.pl:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -309,95 +357,127 @@ 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:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "Vítejte v TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Dokončit"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Žádné"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Jen nové"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Všechny"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Nahrát"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Varování"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Základní informace"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Binární systém(y)"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Vybrané schéma"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Další přizpůsobení"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Standardní kolekce"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Jazykové kolekce"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Nastavení adresářové struktury"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -406,174 +486,161 @@ msgstr ""
 msgid "Toggle"
 msgstr "Přepnout"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (hlavní adresář TeXu)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (adresář pro umístění lokálních souborů)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (adresář pro generované soubory)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (adresář pro lokální konfiguraci)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (adresář pro uživatelské soubory)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Volby"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Povolení spouštění omezeného seznamu programů pomocí \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Vytvořit všechny formáty"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Instalovat dokumentaci fontů/maker"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Instalovat zdrojové soubory fontů/maker"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Vytvořit symbolické linky v systémových adresářích"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Nainstaluj pomocníka TeXworks"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Nainstaluj TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Ukončit"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 #, fuzzy
 msgid "Installation process"
 msgstr "Instalace"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Změnit hodnotu proměnné"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, 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:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Vybrat kolekce k nainstalování"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Zrušit výběr všech položek"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Vybrat podporu jazyků"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Vybrat dokumentaci k jednotlivým jazykům"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "vytvořit symbolické linky v standardních adresářích"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "binární soubory do"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "manuálové stránky do"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "info soubory do"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Vybrat architekturu a OS"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Varování"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 #, fuzzy
 msgid "Removals of the main platform not possible!"
 msgstr "Odstranění hlavní architektury není možné!"
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcí z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(nebyla vybrána žádná jazyková kolekce!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(prosím, změňte nejdříve TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 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:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1709,9 +1776,6 @@ msgstr ""
 #~ msgid "Current package repository:"
 #~ msgstr "Aktuální zdroj balíků:"
 
-#~ msgid "Load"
-#~ msgstr "Nahrát"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr "K nahrání databáze ze zdroje balíků stiskněte toto tlačítko."
 
diff --git a/Master/tlpkg/translations/de.po b/Master/tlpkg/translations/de.po
index bf0d54d51a5..67771ae51c1 100644
--- a/Master/tlpkg/translations/de.po
+++ b/Master/tlpkg/translations/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2009 German Translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-06-19 09:32+0100\n"
 "Last-Translator: Uwe Ziegenhagen <ziegenhagen@gmail.com>\n"
 "Language-Team: TL German Translation Team <tex-live@tug.org>\n"
@@ -13,26 +13,26 @@ msgstr ""
 "X-Poedit-Language: German\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s Installation"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
-#: texmf/scripts/texlive/tlmgrgui.pl:584
-#: texmf/scripts/texlive/tlmgrgui.pl:585
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
+#: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
 #: texmf/scripts/texlive/tlmgrgui.pl:1304
@@ -47,21 +47,26 @@ msgstr "TeX Live %s Installation"
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Zurück"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Nächster >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -77,32 +82,74 @@ msgstr ""
 "\n"
 "Dieser Wizard wird Sie durch die Installation führen."
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "Oder benutzen Sie install-tl-advanced.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: 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."
+msgstr ""
+"Oder benutzen Sie den Kommandozeilenschalter --gui expert für install-tl."
+
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Installationsverzeichnis:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -117,7 +164,7 @@ msgstr "Installationsverzeichnis:"
 msgid "Change"
 msgstr "Ändern"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -125,36 +172,35 @@ msgstr ""
 "Das Installationsverzeichnis enthält die TeX Live installation.\n"
 "Wie empfehlen das Jahr als letzten Ordner beizubehalten."
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr "benötigter Festplattenplatz:"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 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:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Bitte geben Sie den Pfad ein für"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
-#: texmf/scripts/texlive/tlmgrgui.pl:219
-#: texmf/scripts/texlive/tlmgrgui.pl:584
-#: texmf/scripts/texlive/tlmgrgui.pl:588
-#: texmf/scripts/texlive/tlmgrgui.pl:590
-#: texmf/scripts/texlive/tlmgrgui.pl:608
-#: texmf/scripts/texlive/tlmgrgui.pl:787
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
+#: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
+#: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
 #: texmf/scripts/texlive/tlmgrgui.pl:1007
 #: texmf/scripts/texlive/tlmgrgui.pl:1349
 #: texmf/scripts/texlive/tlmgrgui.pl:1379
@@ -175,41 +221,41 @@ msgstr "Bitte geben Sie den Pfad ein für"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "Voreingestelles Papierformat"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr "Füge Menüeinträge hinzu"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Anpassen der Dateiverknüpfungen"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "Adjust PATH setting in registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Installation für alle Benutzer"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr "This screen allows you to configure some options"
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -222,77 +268,82 @@ 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:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Ja"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "Nein"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Installation"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, 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:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -305,8 +356,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:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -314,88 +365,120 @@ msgstr ""
 "Es gab Warnungen während der Installation.\n"
 " Hier die Liste der Warnhinweise"
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "Willkomen bei TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Ende"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Gar nicht"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Nur neue"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Alle"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Laden"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Warnung"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Grundlegende Informationen"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Binärsysteme"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Ausgewähltes Schema"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Weitere Einstellungen"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Paketgruppen der Makro-Pakete"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Paketgruppen der Sprach-Pakete"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Setup der Ordner"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "Portable Installation"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -404,172 +487,159 @@ msgstr "Portable Installation"
 msgid "Toggle"
 msgstr "Ändern"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (Hauptverzeichnis für TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (lokale Makro-Pakete, etc)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (automatisch erstellte Dateien)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (lokale Konfiguration)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (Eigene Makro-Pakete)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Optionen"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Ausführen einer eingeschränkten Liste von Programmen via \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Alle Formatdateien erstellen"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Installation der Font/Macro-Dokumentation"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Installation der Font/Macro-Quellen"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Symbolische Links in Systemverzeichnissen"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Install TeXworks front end"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "TeX Live installieren"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Beenden"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "Installation"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Ändern der Werte von Variablen"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, 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:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "benutzerdefinierte Auswahl der Collections"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Auswahl der zu installierenden Paketgruppen"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Alle anwählen"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Alle abwählen"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Pakete für verschiedene Sprachen"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Dokumentation in verschiedenen Sprachen"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "Erstellen von symbolischen Links in Standardordnern"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "Programme nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "Hilfeseiten (*.man) nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "Infoseiten (*.info) nach"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Auswahl der Architekturen"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Warnung"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 msgid "Removals of the main platform not possible!"
 msgstr "Entfernen der Hauptarchitekturen ist nicht möglich!"
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s von %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s Paketgruppen von %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(keine Sprachkollektion ausgewählt!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(Bitte zuerst TEXDIR ändern!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(Vorgabe ohne Schreibberechtigung - bitte ändern!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -606,7 +676,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."
 
@@ -631,8 +702,7 @@ msgstr "Anzeigeeigenschaften"
 msgid "Status"
 msgstr "Status"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:286
-#: texmf/scripts/texlive/tlmgrgui.pl:339
+#: texmf/scripts/texlive/tlmgrgui.pl:286 texmf/scripts/texlive/tlmgrgui.pl:339
 msgid "all"
 msgstr "Alle"
 
@@ -849,8 +919,7 @@ msgstr ""
 msgid "Manual"
 msgstr "Dokumentation"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:605
-#: texmf/scripts/texlive/tlmgrgui.pl:607
+#: texmf/scripts/texlive/tlmgrgui.pl:605 texmf/scripts/texlive/tlmgrgui.pl:607
 msgid "About"
 msgstr "Über TeX Live Manager (tlmgr)"
 
@@ -917,7 +986,8 @@ msgstr "Paketgruppe:"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:704
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
-msgstr "Warnung: Die Catalogue Versionen können veraltet oder einfach falsch sein."
+msgstr ""
+"Warnung: Die Catalogue Versionen können veraltet oder einfach falsch sein."
 
 #: texmf/scripts/texlive/tlmgrgui.pl:742
 msgid "Depends:"
@@ -947,8 +1017,7 @@ msgstr "Binärdateien:"
 msgid "Further information"
 msgstr "Weitere Informationen"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:976
-#: texmf/scripts/texlive/tlmgrgui.pl:981
+#: texmf/scripts/texlive/tlmgrgui.pl:976 texmf/scripts/texlive/tlmgrgui.pl:981
 msgid "Select platforms to support"
 msgstr "Auswahl der zu unterstützenden Architekturen"
 
@@ -1090,12 +1159,14 @@ msgstr ""
 #, perl-format
 msgid ""
 "Could not load the TeX Live Database from %s\n"
-"If you want to install or update packages, please try with a different package repository!\n"
+"If you want to install or update packages, please try with a different "
+"package repository!\n"
 "\n"
 "For configuration and removal you don't have to do anything."
 msgstr ""
 "Die TeX Live Datenbank konnte nicht von %s geladen werden.\n"
-"Benutzen Sie eine andere Installationsquelle wenn sie Pakete installieren oder aktualisieren wollen.\n"
+"Benutzen Sie eine andere Installationsquelle wenn sie Pakete installieren "
+"oder aktualisieren wollen.\n"
 "\n"
 "Um TeX Live zu konfigurieren oder zu löschen ist dies nicht nötig."
 
@@ -1118,13 +1189,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"
@@ -1133,11 +1206,16 @@ msgstr ""
 #: texmf/scripts/texlive/tlmgrgui.pl:1970
 #, 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:1972
-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:2052
 #: texmf/scripts/texlive/tlmgrgui.pl:2054
@@ -1146,7 +1224,8 @@ msgstr "Wiederherstellung abgeschlossen"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2059
 msgid "Select the package to restore, or restore all packages"
-msgstr "Auswahl des wiederherzustellenden Paketes, oder alle Pakete wiederherstellen"
+msgstr ""
+"Auswahl des wiederherzustellenden Paketes, oder alle Pakete wiederherstellen"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2075
 msgid "Revision:"
@@ -1543,7 +1622,8 @@ msgstr "PSTricks Pakete"
 
 #: tlpkg/translations/shortdesc.pl:88
 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:89
 msgid "Typesetting for natural and computer sciences"
@@ -1667,9 +1747,6 @@ msgstr "XeTeX Pakete"
 #~ msgid "Current package repository:"
 #~ msgstr "Aktuelle Installationsquelle:"
 
-#~ msgid "Load"
-#~ msgstr "Laden"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr ""
 #~ "Diesen Knopf drücken um die Datenbank der Installationsquelle zu laden."
diff --git a/Master/tlpkg/translations/es.po b/Master/tlpkg/translations/es.po
index 4117b35d6c6..62d1fb24a7c 100644
--- a/Master/tlpkg/translations/es.po
+++ b/Master/tlpkg/translations/es.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2009\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+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"
@@ -14,24 +14,25 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalación de TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -47,21 +48,26 @@ msgstr "Instalación de TeX Live %s"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Atrás"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Siguiente >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -80,32 +86,73 @@ msgstr ""
 "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:191
+#: 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"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: tlpkg/installer/install-menu-wizard.pl:194
 msgid "Or use the argument --gui expert to install-tl."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Ruta de instalación:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -120,7 +167,7 @@ msgstr "Ruta de instalación:"
 msgid "Change"
 msgstr "Cambiar"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -129,30 +176,31 @@ msgstr ""
 "Se recomienda encarecidamente que se mantenga el año como la última parte de "
 "la ruta de instalación."
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Introduzca la ruta para"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -176,41 +224,41 @@ msgstr "Introduzca la ruta para"
 msgid "Ok"
 msgstr "Aceptar"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Cambiar asociaciones de archivos"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "Configurar la variable PATH en el registro"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Instalación para todos los usuarios"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr "Esta pantalla le permite configurar ciertas opciones"
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -223,62 +271,62 @@ msgstr ""
 "Si quiere cambiar algo, vuelva atrás,\n"
 "o si quiere continuar presione el botón \"Instalar\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Sí"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "No"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Instalar"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -294,8 +342,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:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -308,95 +356,127 @@ 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:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "¡Bienvenido a Tex Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Terminar"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Ninguna"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Sólo nuevas"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Todas"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "carta"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Cargar"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Advertencia"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Información básica"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Arquitectura seleccionada"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Esquema seleccionado"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Personalización avanzada"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Colecciones estándar"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Colecciones de idiomas"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Configuración de directorios"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -405,172 +485,159 @@ msgstr ""
 msgid "Toggle"
 msgstr "Cambiar (sí/no)"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (directorio TeX principal)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (directorio de ficheros locales)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (directorio de datos generados automáticamente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (directorio de configuración local)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (directorio de ficheros personales del usuario)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Opciones"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Crear todos los archivos de formato"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Instalar la documentación de tipos de letra y macros"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Instalar las fuentes de tipos de letra y macros"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Crear enlaces simbólicos en los  directorios de sistema"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Instalar el editor gráfico TeXworks"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Instalar Tex Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Salir"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "Proceso de instalación"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Cambiar el valor de la variable"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, 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:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Seleccione las colecciones que se instalarán"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Deseleccionar todo"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Seleccionar el idioma"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Seleccionar el idioma para la documentación"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "crear enlaces simbólicos en los directorios estándar"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "ficheros ejecutables en"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "páginas de manual en"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "información en"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Seleccionar arquitectura-sistema operativo"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Advertencia"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s de %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(¡no se seleccionó ninguna colección de idioma!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(por favor, ¡cambie el TEXDIR primero!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(no se permite la escritura, ¡cambie el directorio por favor!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1684,9 +1751,6 @@ msgstr ""
 #~ msgid "Current package repository:"
 #~ msgstr "Repositorio de paquetes actual"
 
-#~ msgid "Load"
-#~ msgstr "Cargar"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr ""
 #~ "Presione este botón para cargar la base de datos desde el repositorio de "
diff --git a/Master/tlpkg/translations/fr.po b/Master/tlpkg/translations/fr.po
index bf455774cdb..f1f30a30118 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: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-06-23 19:23+0200\n"
 "Last-Translator: Manuel Pégourié-Gonnard <mpg@tug.org>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -15,24 +15,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Installation de TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -48,21 +49,26 @@ msgstr "Installation de TeX Live %s"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Précédent"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Suivant >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -83,32 +89,73 @@ msgstr ""
 "d'options,\n"
 "veuillez consulter les pages web ou le guide d'installation."
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "Ou utiliser install-tl-advanced.bat."
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: 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."
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Répertoire de destination :"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -123,7 +170,7 @@ msgstr "Répertoire de destination :"
 msgid "Change"
 msgstr "Modifier"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -131,30 +178,31 @@ msgstr ""
 "Le répertoire de destination contiendra votre système TeX Live.\n"
 "Il est fortement recommandé de conserver l'année comme dernière composante."
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr "espace disque nécessaire :"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 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:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Entrer le chemin"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -178,41 +226,41 @@ msgstr "Entrer le chemin"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "Taille de papier par défaut"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr "Ajouter des raccourcis au menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Modifier les associations de fichiers"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "Modifier le réglage du PATH dans la base de registre"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Installer pour tous les utilisateurs"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 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:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -225,62 +273,62 @@ msgstr ""
 "Si vous souhaitez changer quelque chose, revenez en arrière ;\n"
 "sinon, cliquez sur le bouton « Installer »."
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Oui"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "Non"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Installer"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -297,8 +345,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:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -311,8 +359,8 @@ msgstr ""
 "mais surtout, ajoutez %s/bin/%s\n"
 " à votre PATH, pour cette session et les prochaines."
 
-#: tlpkg/installer/install-menu-wizard.pl:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -320,88 +368,120 @@ msgstr ""
 "Des avertissements ont été émis durant l'installation.\n"
 "Voici la liste des messages émis :"
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "Bienvenue sous TeX Live !"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Terminer"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Aucun"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Seulement les nouveaux"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Tous"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Charger"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Avertissement"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Informations générales"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Plate-forme(s) des binaires"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Schéma sélectionné"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Personnalisation avancée"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Collections standards"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Collections de langues"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Choix des répertoires"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "Options de portabilité"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -410,172 +490,159 @@ msgstr "Options de portabilité"
 msgid "Toggle"
 msgstr "Basculer"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (répertoire TeX principal)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (répertoire des fichiers locaux, etc.)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (répertoire des fichiers générés automatiquement)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (répertoire de la configuration locale)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (répertoire des fichiers personnels)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Options"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Autoriser par défaut l'exécution de certains programmes par \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Générer tous les formats"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Installer la documentation des macros et polices"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Installer les sources des macros et polices"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Créer les liens symboliques dans les répertoires systèmes"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Installer l'éditeur intégré TeXworks"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Installer TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Quitter"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "Processus d'installation"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Changer la valeur de la variable"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Entrer le chemin %s (utiliser ~ pour %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "sélection personnalisée de collections"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Choisir les collections à installer"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Tout désélectionner"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Choisir les langues disponibles"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Choisir les langues des documentations multilingues"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "Créer des liens symboliques dans les répertoires standards"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "Emplacement des binaires"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "Emplacement des pages de man"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "Emplacement des pages info"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Choisir la plate-forme"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Avertissement"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 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:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s parmi %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collections parmi %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(aucune collection de langue sélectionnée !)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(changer d'abord TEXDIR !)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(écriture impossible - changer d'emplacement !)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1688,9 +1755,6 @@ msgstr "Paquet XeTeX"
 #~ msgid "Current package repository:"
 #~ msgstr "Dépôt de paquets actuel :"
 
-#~ msgid "Load"
-#~ msgstr "Charger"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr ""
 #~ "Appuyez sur ce bouton pour charger la base de données depuis le dépôt "
diff --git a/Master/tlpkg/translations/it.po b/Master/tlpkg/translations/it.po
index 857626a31e2..3f0ca0c61cc 100644
--- a/Master/tlpkg/translations/it.po
+++ b/Master/tlpkg/translations/it.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Texlive\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-06-20 09:49+0100\n"
 "Last-Translator: Marco Pallante <marco.pallante@gmail.com>\n"
 "Language-Team: <>\n"
@@ -12,26 +12,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Italian\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Installazione di TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
-#: texmf/scripts/texlive/tlmgrgui.pl:584
-#: texmf/scripts/texlive/tlmgrgui.pl:585
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
+#: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
 #: texmf/scripts/texlive/tlmgrgui.pl:1304
@@ -46,21 +46,26 @@ msgstr "Installazione di TeX Live %s"
 msgid "Cancel"
 msgstr "Annulla"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Indietro"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Avanti >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -79,32 +84,73 @@ msgstr ""
 "Per un'installazione avanzata e personalizzabile, consultate\n"
 "il sito web oppure la guida all'installazione."
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "In alternativa, usate il programma install-tl-advanced.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: 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."
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Percorso di destinazione:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -119,7 +165,7 @@ msgstr "Percorso di destinazione:"
 msgid "Change"
 msgstr "Cambia"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -128,36 +174,34 @@ msgstr ""
 "Raccomandiamo di lasciare l'anno di questa edizione di TeX Live\n"
 "come ultima componente del percorso."
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr "spazio necessario sul disco:"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 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:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Inserisci il percorso per"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
-#: texmf/scripts/texlive/tlmgrgui.pl:219
-#: texmf/scripts/texlive/tlmgrgui.pl:584
-#: texmf/scripts/texlive/tlmgrgui.pl:588
-#: texmf/scripts/texlive/tlmgrgui.pl:590
-#: texmf/scripts/texlive/tlmgrgui.pl:608
-#: texmf/scripts/texlive/tlmgrgui.pl:787
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
+#: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
+#: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
 #: texmf/scripts/texlive/tlmgrgui.pl:1007
 #: texmf/scripts/texlive/tlmgrgui.pl:1349
 #: texmf/scripts/texlive/tlmgrgui.pl:1379
@@ -178,41 +222,41 @@ msgstr "Inserisci il percorso per"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "Formato pagina predefinito"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr "Aggiungi le scorciatoie da menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Cambia le associazioni dei file"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "Correggere le impostazioni del PATH nel registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Installazione per tutti gli utenti"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr "Da questa schermata è possibile configurare alcune opzioni"
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -225,72 +269,80 @@ msgstr ""
 "Se desiderate modificare qualcosa prima di procedere, tornate indietro,\n"
 "altrimenti premete sul pulsante \"Installa\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Sì"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "No"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Installa"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, 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 ""
-"Consulta la pagina %s/index.html nella directory di installazione per i riferimenti alla documentazione.\n"
-"Visita il sito di TeX Live (http://tug.org/texlive/) per aggiornamenti e correzioni. TeX Live è un progetto comune dei gruppi di utenti TeX sparsi per il mondo; per sostenere il progetto, puoi unirti al gruppo più vicino. La lista dei gruppi è disponibile sul web alla pagina http://tug.org/usergroups.html."
-
-#: tlpkg/installer/install-menu-wizard.pl:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+"Consulta la pagina %s/index.html nella directory di installazione per i "
+"riferimenti alla documentazione.\n"
+"Visita il sito di TeX Live (http://tug.org/texlive/) per aggiornamenti e "
+"correzioni. TeX Live è un progetto comune dei gruppi di utenti TeX sparsi "
+"per il mondo; per sostenere il progetto, puoi unirti al gruppo più vicino. "
+"La lista dei gruppi è disponibile sul web alla pagina http://tug.org/"
+"usergroups.html."
+
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -304,8 +356,8 @@ msgstr ""
 "in questa sessione ed ai prossimi avvii,\n"
 "aggiungi %s/bin/%s alla tua variabile PATH."
 
-#: tlpkg/installer/install-menu-wizard.pl:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -313,88 +365,120 @@ 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:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "Benvenuti a TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Fine"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Nessuno"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Solo nuovi"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Tutti"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "lettera"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Carica"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Attenzione"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Informazioni di base"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Architetture selezionate"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Schemi selezionati"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Personalizzazioni aggiuntive"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Collezioni di base"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Collezioni di lingue"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Impostazione delle directory"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "Allestimento portatile"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -403,172 +487,160 @@ msgstr "Allestimento portatile"
 msgid "Toggle"
 msgstr "Inverti"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (directory principale di TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (directory per i file comuni a tutti gli utenti)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (directory per i dati generati automaticamente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (directory della configurazione per tutti gli utenti)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (directory dei file specifici per ciascun utente)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Opzioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
-msgstr "Consenti l'esecuzione di una ristretta lista di programmi tramite \\write18"
+msgstr ""
+"Consenti l'esecuzione di una ristretta lista di programmi tramite \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Crea tutti i file di formato"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Installa la documentazione per font e macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Installa i sorgenti per font e macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Crea i collegamenti nelle directory di sistema"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Installa il programma TeXworks"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Installa TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Esci"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "Installazione"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Cambia il valore della variabile"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, 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:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "selezione personalizzata delle collezioni"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Seleziona le collezioni di pacchetti da installare"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Seleziona Tutto"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Deseleziona Tutto"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Seleziona il supporto per le lingue"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Seleziona la documentazione per le diverse lingue"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "crea i collegamenti simbolici nelle directory standard"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "eseguibili in"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "pagine di manuale in"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "pagine info in"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Seleziona le combinazioni di architetture e sistemi operativi"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Attenzione"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 msgid "Removals of the main platform not possible!"
 msgstr "Non è possibile rimuovere la piattaforma principale!"
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s su %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collezioni su %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(non è stata selezionata alcuna collezione di lingue!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(è necessario cambiare TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(non si hanno i permessi di scrittura - cambiare il percorso!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -605,7 +677,8 @@ msgid ""
 msgstr ""
 "Non hai i permessi sufficienti per cambiare l'installazione;\n"
 "in particolare, la directory %s non è scrivibile.\n"
-"Esegui questo programma come amministratore oppure contatta il tuo amministratore.\n"
+"Esegui questo programma come amministratore oppure contatta il tuo "
+"amministratore.\n"
 "\n"
 "La maggior parte dei pulsanti sarà disabilitata."
 
@@ -630,8 +703,7 @@ msgstr "Impostazioni di visualizzazione"
 msgid "Status"
 msgstr "Stato"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:286
-#: texmf/scripts/texlive/tlmgrgui.pl:339
+#: texmf/scripts/texlive/tlmgrgui.pl:286 texmf/scripts/texlive/tlmgrgui.pl:339
 msgid "all"
 msgstr "tutti"
 
@@ -848,8 +920,7 @@ msgstr ""
 msgid "Manual"
 msgstr "Manuale"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:605
-#: texmf/scripts/texlive/tlmgrgui.pl:607
+#: texmf/scripts/texlive/tlmgrgui.pl:605 texmf/scripts/texlive/tlmgrgui.pl:607
 msgid "About"
 msgstr "Informazioni"
 
@@ -916,7 +987,8 @@ msgstr "Collezione:"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:704
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
-msgstr "Attenzione: Le versioni del catalogo potrebbero essere obsolete o sbagliate."
+msgstr ""
+"Attenzione: Le versioni del catalogo potrebbero essere obsolete o sbagliate."
 
 #: texmf/scripts/texlive/tlmgrgui.pl:742
 msgid "Depends:"
@@ -946,8 +1018,7 @@ msgstr "Eseguibili:"
 msgid "Further information"
 msgstr "Altre informazioni"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:976
-#: texmf/scripts/texlive/tlmgrgui.pl:981
+#: texmf/scripts/texlive/tlmgrgui.pl:976 texmf/scripts/texlive/tlmgrgui.pl:981
 msgid "Select platforms to support"
 msgstr "Seleziona le piattaforme da supportare"
 
@@ -1089,12 +1160,14 @@ msgstr ""
 #, perl-format
 msgid ""
 "Could not load the TeX Live Database from %s\n"
-"If you want to install or update packages, please try with a different package repository!\n"
+"If you want to install or update packages, please try with a different "
+"package repository!\n"
 "\n"
 "For configuration and removal you don't have to do anything."
 msgstr ""
 "Impossibile caricare l'archivio di TeX Live da %s\n"
-"Se desideri installare o aggiornare i pacchetti, prova un altro archivio di pacchetti!\n"
+"Se desideri installare o aggiornare i pacchetti, prova un altro archivio di "
+"pacchetti!\n"
 "\n"
 "Per la configurazione e la rimozione non è necessario fare nulla."
 
@@ -1117,14 +1190,16 @@ 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 ""
 "Sono presenti aggiornamenti per tlmgr.\n"
 "L'installazione e gli aggiornamenti non funzioneranno se non sono forzati.\n"
-"Selezionate il pulsante \"Aggiorna installati\" dopo aver chiuso questa finestra.\n"
+"Selezionate il pulsante \"Aggiorna installati\" dopo aver chiuso questa "
+"finestra.\n"
 "\n"
 "Il programma verrà  terminato dopo l'aggiornamento.\n"
 "A quel punto sarà possibile riavviarlo per ulteriori aggiornamenti."
@@ -1132,11 +1207,17 @@ msgstr ""
 #: texmf/scripts/texlive/tlmgrgui.pl:1970
 #, perl-format
 msgid "At least %s further updates are available after tlmgr has been updated."
-msgstr "Dall'ultimo aggiornamento di tlmgr, sono disponibili almeno %s ulteriori aggiornamenti."
+msgstr ""
+"Dall'ultimo aggiornamento di tlmgr, sono disponibili almeno %s ulteriori "
+"aggiornamenti."
 
 #: texmf/scripts/texlive/tlmgrgui.pl:1972
-msgid "Please wait a bit after the program has terminated so that the update can be completed."
-msgstr "Dopo che il programma abbia terminato, attendi qualche istante per consentire il completamento dell'aggiornamento."
+msgid ""
+"Please wait a bit after the program has terminated so that the update can be "
+"completed."
+msgstr ""
+"Dopo che il programma abbia terminato, attendi qualche istante per "
+"consentire il completamento dell'aggiornamento."
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2052
 #: texmf/scripts/texlive/tlmgrgui.pl:2054
@@ -1210,7 +1291,8 @@ msgstr "Schema GUST TeX Live"
 
 #: tlpkg/translations/shortdesc.pl:5
 msgid "medium scheme (plain, latex, recommended packages, some languages)"
-msgstr "Schema intermedio (plain, LaTeX, pacchetti raccomandati, alcune lingue)"
+msgstr ""
+"Schema intermedio (plain, LaTeX, pacchetti raccomandati, alcune lingue)"
 
 #: tlpkg/translations/shortdesc.pl:6
 msgid "minimal scheme (plain only)"
@@ -1673,9 +1755,6 @@ msgstr "Pacchetti XeTeX"
 #~ msgid "Current package repository:"
 #~ msgstr "Attuale archivio dei pacchetti:"
 
-#~ msgid "Load"
-#~ msgstr "Carica"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr "Premi questo pulsante per caricare l'archivio dei pacchetti."
 
diff --git a/Master/tlpkg/translations/ja.po b/Master/tlpkg/translations/ja.po
index ba206dddf5a..aae01efc944 100644
--- a/Master/tlpkg/translations/ja.po
+++ b/Master/tlpkg/translations/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-08-23 15:00+0900\n"
 "Last-Translator: Koji Yokota <yokota@res.otaru-uc.ac.jp>\n"
 "Language-Team: Japanese <tex-live@tug.org>\n"
@@ -17,26 +17,26 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s の導入"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
-#: texmf/scripts/texlive/tlmgrgui.pl:584
-#: texmf/scripts/texlive/tlmgrgui.pl:585
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
+#: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
 #: texmf/scripts/texlive/tlmgrgui.pl:1304
@@ -51,21 +51,26 @@ msgstr "TeX Live %s の導入"
 msgid "Cancel"
 msgstr "取消"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "←戻る"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "次へ→"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -84,32 +89,73 @@ msgstr ""
 "設定可能な、高度な導入を行うには、導入ガイドの\n"
 "ウェブページをごらんください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "あるいは install-tl-advanced.bat を使用してください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: tlpkg/installer/install-menu-wizard.pl:194
 msgid "Or use the argument --gui expert to install-tl."
 msgstr "あるいは install-tl に引数 --gui expert を付けてください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "導入先フォルダ:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -124,7 +170,7 @@ msgstr "導入先フォルダ:"
 msgid "Change"
 msgstr "変更"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -132,36 +178,34 @@ msgstr ""
 "導入先フォルダには、インストールしたものが入ります。\n"
 "最後尾に年を入れたままにしておくことを強くお勧めします。"
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr "必要ディスク領域:"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(既定値が許されないか書き込み不能です―変更してください！)"
 
-#: tlpkg/installer/install-menu-wizard.pl:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "右の変数のパスを入力→"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
-#: texmf/scripts/texlive/tlmgrgui.pl:219
-#: texmf/scripts/texlive/tlmgrgui.pl:584
-#: texmf/scripts/texlive/tlmgrgui.pl:588
-#: texmf/scripts/texlive/tlmgrgui.pl:590
-#: texmf/scripts/texlive/tlmgrgui.pl:608
-#: texmf/scripts/texlive/tlmgrgui.pl:787
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
+#: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
+#: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
 #: texmf/scripts/texlive/tlmgrgui.pl:1007
 #: texmf/scripts/texlive/tlmgrgui.pl:1349
 #: texmf/scripts/texlive/tlmgrgui.pl:1379
@@ -182,41 +226,41 @@ msgstr "右の変数のパスを入力→"
 msgid "Ok"
 msgstr "OK"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "既定用紙寸法"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr "メニュー短絡キーを追加"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "ファイル関連付けを変更する"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "レジストリの PATH 設定を調整する"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "全ユーザ用に導入"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr "この画面では、いくつかのオプションを設定することができます。"
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -229,72 +273,79 @@ msgstr ""
 "変更したいものがある場合には、前に戻ってください。\n"
 "そうでなければ、「導入」ボタンを押してください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "はい"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "いいえ"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "導入"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, 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 ""
 "説明書へのリンクは、%s/index.html をごらんください。\n"
-"TeX Live ウェブサイト（http://tug.org/texlive/）には、すべての更新と修正が掲載されて います。TeX Live は世界中の TeX ユーザーグループとの共同プロジェクトです。利用 しやすいグループに属することで、このプロジェクトを サポートしていただけると助かります。 グループの一覧は、ウェブ上の http://tug.org/usergroups.html にあります"
-
-#: tlpkg/installer/install-menu-wizard.pl:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+"TeX Live ウェブサイト（http://tug.org/texlive/）には、すべての更新と修正が掲"
+"載されて います。TeX Live は世界中の TeX ユーザーグループとの共同プロジェクト"
+"です。利用 しやすいグループに属することで、このプロジェクトを サポートしてい"
+"ただけると助かります。 グループの一覧は、ウェブ上の http://tug.org/"
+"usergroups.html にあります"
+
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -307,8 +358,8 @@ msgstr ""
 "特に、現セッションと今後のために、%s/bin/%s を\n"
 "PATH に追加してください。"
 
-#: tlpkg/installer/install-menu-wizard.pl:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -316,88 +367,120 @@ msgstr ""
 "導入の過程において警告が発せられました。\n"
 "警告メッセージは以下のとおりです。"
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "TeX Live へようこそ！"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "終了"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "なし"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "新規のみ"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "全部"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "レター"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "読み込み"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "警告"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "基本情報"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "バイナリシステム"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "選択したスキーム"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "追加設定"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "標準コレクション"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "言語コレクション"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "ディレクトリ設定"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "かんたん設定"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -406,172 +489,159 @@ msgstr "かんたん設定"
 msgid "Toggle"
 msgstr "入切"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR（TeX主幹ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL（サイト固有ファイル用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR（自動生成データ用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG（ローカル設定用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME（ユーザ固有ファイル用ディレクトリ）"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "オプション"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "\\write18 を用いて制限リスト中のプログラムを実行することを許可"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "フォーマットファイルをすべて生成"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "font と macro の doc ツリーを導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "font と macro のソースツリーを導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "システムディレクトリに symlink を作成する"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "TeXworks フロントエンドを導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "TeX Live の導入"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "終了"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "導入プロセス"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "変数の値を変更"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "%s のパスを入力してください（%s を表すには ~ を使用してください）"
 
-#: tlpkg/installer/install-menu-perltk.pl:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "コレクションの任意選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "導入するコレクションを選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "すべてを選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "すべてを非選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "言語サポートを選択"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "言語固有の説明書を選択してください"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "symlink を標準ディレクトリに作成する"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "バイナリ先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "man ページ先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "info 先:"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "arch-os を選択してください"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "警告"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 msgid "Removals of the main platform not possible!"
 msgstr "主幹プラットフォームを取り除くことはできません！"
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s（全 %s 中）"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s コレクション（全 %s 中）"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "（言語コレクションが選択されていません！）"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "（先に TEXDIR を変更してください！）"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "（既定値では書き込みできません。変更してください！）"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -608,7 +678,8 @@ msgid ""
 msgstr ""
 "導入済のものを変更する権限がありません。\n"
 "正確には、ディレクトリ %s が書き込み可能になっていません。\n"
-"このプログラムを管理者として実行するか、ローカルの管理者に連絡をとってください。\n"
+"このプログラムを管理者として実行するか、ローカルの管理者に連絡をとってくださ"
+"い。\n"
 "\n"
 "ほとんどのボタンは利用不能になります。"
 
@@ -633,8 +704,7 @@ msgstr "表示設定"
 msgid "Status"
 msgstr "状態"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:286
-#: texmf/scripts/texlive/tlmgrgui.pl:339
+#: texmf/scripts/texlive/tlmgrgui.pl:286 texmf/scripts/texlive/tlmgrgui.pl:339
 msgid "all"
 msgstr "すべて"
 
@@ -851,8 +921,7 @@ msgstr ""
 msgid "Manual"
 msgstr "取扱説明書"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:605
-#: texmf/scripts/texlive/tlmgrgui.pl:607
+#: texmf/scripts/texlive/tlmgrgui.pl:605 texmf/scripts/texlive/tlmgrgui.pl:607
 msgid "About"
 msgstr "このプログラムについて"
 
@@ -919,7 +988,8 @@ msgstr "コレクション:"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:704
 msgid "Warning: Catalogue versions might be lagging behind or be simply wrong."
-msgstr "警告： カタログバージョンが追いついていないか、間違っている可能性があります。"
+msgstr ""
+"警告： カタログバージョンが追いついていないか、間違っている可能性があります。"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:742
 msgid "Depends:"
@@ -949,8 +1019,7 @@ msgstr "Bin ファイル:"
 msgid "Further information"
 msgstr "詳細情報"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:976
-#: texmf/scripts/texlive/tlmgrgui.pl:981
+#: texmf/scripts/texlive/tlmgrgui.pl:976 texmf/scripts/texlive/tlmgrgui.pl:981
 msgid "Select platforms to support"
 msgstr "サポートするアーキテクチャを選択してください"
 
@@ -1092,12 +1161,14 @@ msgstr ""
 #, perl-format
 msgid ""
 "Could not load the TeX Live Database from %s\n"
-"If you want to install or update packages, please try with a different package repository!\n"
+"If you want to install or update packages, please try with a different "
+"package repository!\n"
 "\n"
 "For configuration and removal you don't have to do anything."
 msgstr ""
 "TeX Live データベースを %s から読み込むことができませんでした。\n"
-"パッケージを導入や更新を行いたい場合には、別のパッケージレポジトリを試してみてください！\n"
+"パッケージを導入や更新を行いたい場合には、別のパッケージレポジトリを試してみ"
+"てください！\n"
 "\n"
 "設定や削除には、何もする必要はありません。"
 
@@ -1120,7 +1191,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."
@@ -1138,7 +1210,9 @@ msgid "At least %s further updates are available after tlmgr has been updated."
 msgstr "tlmgr の更新後、さらに少なくとも %s の更新が利用可能となっています。"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:1972
-msgid "Please wait a bit after the program has terminated so that the update can be completed."
+msgid ""
+"Please wait a bit after the program has terminated so that the update can be "
+"completed."
 msgstr "プログラムが終了した後も、更新が完了するまでしばらくお待ちください。"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:2052
@@ -1667,9 +1741,6 @@ msgstr "XeTeXパッケージ"
 #~ msgid "Current package repository:"
 #~ msgstr "現在のパッケージリポジトリ："
 
-#~ msgid "Load"
-#~ msgstr "読み込み"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr ""
 #~ "パッケージレポジトリからデータベースを読み込むには、このボタンを押してくだ"
diff --git a/Master/tlpkg/translations/messages.pot b/Master/tlpkg/translations/messages.pot
index 90074c06b40..73eb030ab1b 100644
--- a/Master/tlpkg/translations/messages.pot
+++ b/Master/tlpkg/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2010\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+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"
@@ -17,24 +17,25 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -50,21 +51,26 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -76,32 +82,73 @@ msgid ""
 "the web pages or installation guide."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: tlpkg/installer/install-menu-wizard.pl:194
 msgid "Or use the argument --gui expert to install-tl."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -116,36 +163,37 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -169,41 +217,41 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -212,62 +260,62 @@ msgid ""
 "otherwise press the \"Install\" button."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -277,8 +325,8 @@ msgid ""
 "list of groups is available on the web at http://tug.org/usergroups.html."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -287,95 +335,127 @@ msgid ""
 "to your PATH for current and future sessions."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -384,172 +464,159 @@ msgstr ""
 msgid "Toggle"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr ""
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
diff --git a/Master/tlpkg/translations/nl.po b/Master/tlpkg/translations/nl.po
index 85307858b8d..ef73094c5fc 100644
--- a/Master/tlpkg/translations/nl.po
+++ b/Master/tlpkg/translations/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2009 Translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-06-18 11:06+0100\n"
 "Last-Translator: Siep Kroonenberg <siepo@cybercomm.nl>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -12,26 +12,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s Installatie"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
-#: texmf/scripts/texlive/tlmgrgui.pl:584
-#: texmf/scripts/texlive/tlmgrgui.pl:585
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
+#: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
 #: texmf/scripts/texlive/tlmgrgui.pl:1304
@@ -46,21 +46,26 @@ msgstr "TeX Live %s Installatie"
 msgid "Cancel"
 msgstr "Afbreken"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Terug"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Volgende >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -79,32 +84,73 @@ msgstr ""
 "Raadpleeg voor geavanceerde installatie op maat\n"
 "de web paginas of de installatie-gids."
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "Of gebruik install-tl-advanced.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: 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"
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Bestemmings-folder"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -119,7 +165,7 @@ msgstr "Bestemmings-folder"
 msgid "Change"
 msgstr "Wijzig"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -127,36 +173,34 @@ 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:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr "benodigde schijfruimte"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(default niet toegestaan of niet schrijfbaar - aub wijzigen!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Pad voor"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
-#: texmf/scripts/texlive/tlmgrgui.pl:219
-#: texmf/scripts/texlive/tlmgrgui.pl:584
-#: texmf/scripts/texlive/tlmgrgui.pl:588
-#: texmf/scripts/texlive/tlmgrgui.pl:590
-#: texmf/scripts/texlive/tlmgrgui.pl:608
-#: texmf/scripts/texlive/tlmgrgui.pl:787
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
+#: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
+#: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
 #: texmf/scripts/texlive/tlmgrgui.pl:1007
 #: texmf/scripts/texlive/tlmgrgui.pl:1349
 #: texmf/scripts/texlive/tlmgrgui.pl:1379
@@ -177,41 +221,41 @@ msgstr "Pad voor"
 msgid "Ok"
 msgstr "Ok"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "Standaard papier-formaat voor"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr "Maak TeX Live menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Wijzig bestandstypen"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "PATH aanpassen in registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Installeer voor alle gebruikers"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr "Met dit scherm kunt u enkele opties instellen."
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -224,66 +268,69 @@ msgstr ""
 "Ga terug als u iets wilt wijzigen,\n"
 "zo niet, klik dan op de \"Installeren\" knop."
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Ja"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "Nee"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Installeren"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, 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"
@@ -292,8 +339,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:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -306,8 +353,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:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -315,88 +362,120 @@ msgstr ""
 "Er waren enkele waarschuwingen gedurende installatie.\n"
 "Hier is de lijst van waarschuwingen:"
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "Welkom bij TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Sluit af"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Geen"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Alleen nieuw"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Alle"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Laad"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Basisinformatie"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Platform(s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Gekozen schema"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Verdere verfijning"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Standaard-collecties"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Taal-collecties"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Folders"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "Portable setup"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -405,172 +484,159 @@ msgstr "Portable setup"
 msgid "Toggle"
 msgstr "Wijzig"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (hoofd TeX-folder)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (lokale stijlen etc.)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (automatisch gegenereerde bestanden)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (lokale configuratie)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (eigen macros etc.)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Opties"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Sta uitvoering van een beperkte lijst programmas toe via \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Genereer alle format bestanden"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Installeer font/macro doc folder"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Installeer font/macro bron folder"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Maak symlinks naar standaard-folders"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Installeer TeXworks front-end"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Installeer TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Stoppen"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "Installatie"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Nieuwe waarde"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Pad voor %s (gebruik ~ voor %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "Eigen selektie van collekties"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Kies te installeren collecties"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Kies alles"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Kies niets"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Keuze van talen"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Talen voor documentatie"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "Maak symlinks naar standaard-folders"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "programma's naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "manpages naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "info naar"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Kies platform(s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 msgid "Removals of the main platform not possible!"
 msgstr "Verwijdering van de hoofd-architektuur niet mogelijk!"
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s van %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s collecties van %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(geen taal-collectie geselecteerd!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(TEXDIR eerst veranderen!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(geen schrijf-toegang - wijzig!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -607,7 +673,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."
 
@@ -632,8 +699,7 @@ msgstr "Laat instellingen zien"
 msgid "Status"
 msgstr "Status"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:286
-#: texmf/scripts/texlive/tlmgrgui.pl:339
+#: texmf/scripts/texlive/tlmgrgui.pl:286 texmf/scripts/texlive/tlmgrgui.pl:339
 msgid "all"
 msgstr "alle"
 
@@ -799,7 +865,9 @@ msgstr "Deaktiveer automatische installatie van nieuwe pakketten"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:529
 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:536
 msgid "Update filename database"
@@ -850,8 +918,7 @@ msgstr ""
 msgid "Manual"
 msgstr "Handleiding"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:605
-#: texmf/scripts/texlive/tlmgrgui.pl:607
+#: texmf/scripts/texlive/tlmgrgui.pl:605 texmf/scripts/texlive/tlmgrgui.pl:607
 msgid "About"
 msgstr "Info"
 
@@ -948,8 +1015,7 @@ msgstr "Bin bestanden:"
 msgid "Further information"
 msgstr "Nadere informatie"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:976
-#: texmf/scripts/texlive/tlmgrgui.pl:981
+#: texmf/scripts/texlive/tlmgrgui.pl:976 texmf/scripts/texlive/tlmgrgui.pl:981
 msgid "Select platforms to support"
 msgstr "Keuze van te ondersteunen architecturen"
 
@@ -1091,12 +1157,14 @@ msgstr ""
 #, perl-format
 msgid ""
 "Could not load the TeX Live Database from %s\n"
-"If you want to install or update packages, please try with a different package repository!\n"
+"If you want to install or update packages, please try with a different "
+"package repository!\n"
 "\n"
 "For configuration and removal you don't have to do anything."
 msgstr ""
 "Het laden van de TeX Live Database vanaf %s is mislukt\n"
-"Als u pakketten wilt installeren of bijwerken, probeer dan een andere installatie-bron!\n"
+"Als u pakketten wilt installeren of bijwerken, probeer dan een andere "
+"installatie-bron!\n"
 "\n"
 "Voor instellingen en voor verwijderen hoeft u niets te doen."
 
@@ -1119,7 +1187,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."
@@ -1137,8 +1206,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:1972
-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:2052
 #: texmf/scripts/texlive/tlmgrgui.pl:2054
@@ -1544,7 +1617,8 @@ msgstr "PSTricks pakketten"
 
 #: tlpkg/translations/shortdesc.pl:88
 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:89
 msgid "Typesetting for natural and computer sciences"
@@ -1671,9 +1745,6 @@ msgstr "XeTeX pakketten"
 #~ msgid "Current package repository:"
 #~ msgstr "Huidige installatie-bron"
 
-#~ msgid "Load"
-#~ msgstr "Laad"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr "Klik deze knop om de database te laden van de installatie-bron."
 
diff --git a/Master/tlpkg/translations/pl.po b/Master/tlpkg/translations/pl.po
index 85f8839cf2d..a54b8ca12a7 100644
--- a/Master/tlpkg/translations/pl.po
+++ b/Master/tlpkg/translations/pl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2009 Translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-06-22 18:36+0100\n"
 "Last-Translator: Staszek Wawrykiewicz <staw@gust.org.pl>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -12,26 +12,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Instalowanie TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
-#: texmf/scripts/texlive/tlmgrgui.pl:584
-#: texmf/scripts/texlive/tlmgrgui.pl:585
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
+#: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
 #: texmf/scripts/texlive/tlmgrgui.pl:1304
@@ -46,21 +46,26 @@ msgstr "Instalowanie TeX Live %s"
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "<Cofnij"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Dalej >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -80,32 +85,73 @@ msgstr ""
 "schematów, kolekcji itp.) opuść program i uruchom go\n"
 "z linii poleceń: install-tl -gui."
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "Lub użyj install-tl-advanced.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: 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."
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Docelowy folder:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -120,7 +166,7 @@ msgstr "Docelowy folder:"
 msgid "Change"
 msgstr "Zmień"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -128,36 +174,35 @@ msgstr ""
 "Docelowy folder będzie zawierał instalację.\n"
 "Zaleca się, aby ostatnim komponentem był rok wydania. "
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr "wymagana przestrzeń na dysku:"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 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:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Podaj ścieżkę dla"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
-#: texmf/scripts/texlive/tlmgrgui.pl:219
-#: texmf/scripts/texlive/tlmgrgui.pl:584
-#: texmf/scripts/texlive/tlmgrgui.pl:588
-#: texmf/scripts/texlive/tlmgrgui.pl:590
-#: texmf/scripts/texlive/tlmgrgui.pl:608
-#: texmf/scripts/texlive/tlmgrgui.pl:787
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
+#: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
+#: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
+#: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
 #: texmf/scripts/texlive/tlmgrgui.pl:1007
 #: texmf/scripts/texlive/tlmgrgui.pl:1349
 #: texmf/scripts/texlive/tlmgrgui.pl:1379
@@ -178,41 +223,41 @@ msgstr "Podaj ścieżkę dla"
 msgid "Ok"
 msgstr "Zamknij"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "Domyślny format papieru"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr "Dodaj skróty do menu systemowego"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Zmiana asocjacji typu plików"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "Zapis ustawienia PATH w pliku rejestru"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Instalacja dla wszystkich użytkowników "
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr "Ekran ten pozwala skonfigurować niektóre ustawienia"
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -225,75 +270,79 @@ msgstr ""
 "(jeśli chcesz je zmienić, cofnij się,\n"
 "w przeciwnym wypadku naciśnij przycisk \"Instaluj\"):"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Tak"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "Nie"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Instaluj"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, 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:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -306,8 +355,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:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 #, fuzzy
 msgid ""
 "There were some warnings during the installation process.\n"
@@ -316,88 +365,120 @@ msgstr ""
 "Podczas instalacji wystąpiło kilka ostrzeżeń\n"
 "Oto ich podsumowanie:"
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "TeX Live wita!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Zakończ"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Nie"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Tylko dla nowych"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Dla wszystkich"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Wczytaj"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Informacje podstawowe"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Pakiet(y) programów dla systemów operacyjnych"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Wybrany schemat instalacji"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Dalsze ustawienia"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Kolekcje standardowe"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Kolekcje językowe"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Wybór folderów"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "Ustawienia dla instalacji przenośnej"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -406,172 +487,159 @@ msgstr "Ustawienia dla instalacji przenośnej"
 msgid "Toggle"
 msgstr "Zmień"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (główny folder dla instalacji)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (folder dla stylów, fontów itp. w lokalnej sieci)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (folder dla plików generowanych automatycznie)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (folder dla lokalnych plików konfiguracyjnych)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (folder dla prywatnych plików użytkownika)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Opcje"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Zezwalaj na uruchomienie wybranych programów via \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Generowanie wszystkich plików formatów"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Instalowanie dokumentacji fontu/makr"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Instalowanie plików źródłowych fontu/makr"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Dowiązania symboliczne w folderach systemowych"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Instalacja edytora TeXworks"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Zainstaluj TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Zakończ"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "Instalacja w toku"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Zmień wartości zmiennych"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, 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:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "indywidualny wybór kolekcji"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Wybór kolekcji do zainstalowania"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Wybierz wszystko"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Wyłącz wszystko"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Wybór obsługi języka"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Wybór dokumentacji w języku"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "Utwórz dowiązania symboliczne w standardowych folderach"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "Programy według"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "Strony man według"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "Dokumentacje info według"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Wybór systemu operacyjnego"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 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:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s spośród %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcji spośród %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(nie zaznaczono żadnej kolekcji językowej!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(proszę zmienić najpierw TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(domyślnie nie masz prawa do zapisu - proszę zmienić!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -635,8 +703,7 @@ msgstr "Konfiguracja wyświetlania"
 msgid "Status"
 msgstr "Status"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:286
-#: texmf/scripts/texlive/tlmgrgui.pl:339
+#: texmf/scripts/texlive/tlmgrgui.pl:286 texmf/scripts/texlive/tlmgrgui.pl:339
 msgid "all"
 msgstr "wszystkie"
 
@@ -802,7 +869,8 @@ msgstr "Wyłącz automatyczne instalowanie nowszych pakietów"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:529
 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:536
 msgid "Update filename database"
@@ -854,8 +922,7 @@ msgstr ""
 msgid "Manual"
 msgstr "Podręcznik"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:605
-#: texmf/scripts/texlive/tlmgrgui.pl:607
+#: texmf/scripts/texlive/tlmgrgui.pl:605 texmf/scripts/texlive/tlmgrgui.pl:607
 msgid "About"
 msgstr "O programie"
 
@@ -922,7 +989,9 @@ msgstr "Kolekcja:"
 
 #: texmf/scripts/texlive/tlmgrgui.pl:704
 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:742
 msgid "Depends:"
@@ -952,8 +1021,7 @@ msgstr "Pliki binariów:"
 msgid "Further information"
 msgstr "Pozostałe informacje"
 
-#: texmf/scripts/texlive/tlmgrgui.pl:976
-#: texmf/scripts/texlive/tlmgrgui.pl:981
+#: texmf/scripts/texlive/tlmgrgui.pl:976 texmf/scripts/texlive/tlmgrgui.pl:981
 msgid "Select platforms to support"
 msgstr "Wybierz platformę (system operacyjny)"
 
@@ -1096,12 +1164,14 @@ msgstr ""
 #, perl-format
 msgid ""
 "Could not load the TeX Live Database from %s\n"
-"If you want to install or update packages, please try with a different package repository!\n"
+"If you want to install or update packages, please try with a different "
+"package repository!\n"
 "\n"
 "For configuration and removal you don't have to do anything."
 msgstr ""
 "Nie można wczytać bazy danych TL z %s\n"
-"Do zaistalowania lub aktualizacji pakietów proszę spróbować innej lokalizacji repozytorium!\n"
+"Do zaistalowania lub aktualizacji pakietów proszę spróbować innej "
+"lokalizacji repozytorium!\n"
 "\n"
 "Dla konfiguracji i/lub usuwania nie musisz nic robić."
 
@@ -1124,14 +1194,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 kontynuacji aktualizowania. "
@@ -1142,8 +1215,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:1972
-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:2052
 #: texmf/scripts/texlive/tlmgrgui.pl:2054
@@ -1217,7 +1294,8 @@ msgstr "schemat GUST"
 
 #: tlpkg/translations/shortdesc.pl:5
 msgid "medium scheme (plain, latex, recommended packages, some languages)"
-msgstr "schemat typowy - medium (plain, latex, pakiety rekomendowane, wybrane języki)"
+msgstr ""
+"schemat typowy - medium (plain, latex, pakiety rekomendowane, wybrane języki)"
 
 #: tlpkg/translations/shortdesc.pl:6
 msgid "minimal scheme (plain only)"
@@ -1573,8 +1651,10 @@ msgstr "Pakiety dla XeTeX"
 
 #~ msgid "Restore done"
 #~ msgstr "Odtwarzanie zakończone"
+
 #~ msgid "Add shortcuts to menu and desktop"
 #~ msgstr "Dodanie skrótów do menu i na pulpicie"
+
 #~ msgid ""
 #~ "Updates for the tlmgr are present.\n"
 #~ "Installation and upgrades won't work without being forced.\n"
@@ -1587,79 +1667,107 @@ msgstr "Pakiety dla XeTeX"
 #~ "Naciśnij przycisk \"Aktualizuj wszystkie pakiety\" poniżej.\n"
 #~ "Program zakończy działanie po zaktualizowaniu tlmgr.\n"
 #~ "Uruchom ponownie program, aby dokonać dalszych aktualizacji."
+
 #~ msgid "(no description available)"
 #~ msgstr "(brak opisu)"
+
 #~ msgid "Use Ctrl or Shift or drag to select more"
 #~ msgstr "Użyj Ctrl, Shift lub przeciągnij mysz aby zaznaczyć więcej"
+
 #~ msgid "Select packages"
 #~ msgstr "Zaznacz pakiety"
+
 #~ msgid "Search"
 #~ msgstr "Szukaj"
+
 #~ msgid "Next"
 #~ msgstr "Dalej"
+
 #~ msgid "Information on the selected item"
 #~ msgstr "Informacja o zaznaczonym pakiecie"
+
 #~ msgid "Force"
 #~ msgstr "Wymuś"
+
 #~ msgid ""
 #~ "Force the removal of a package even if it is referenced in a collection."
 #~ msgstr "Wymuś usuwanie pakietu, nawet jeśli należy do kolekcji."
+
 #~ msgid "without depends"
 #~ msgstr "bez zależności"
+
 #~ msgid ""
 #~ "For collections: install or remove will not install/remove the "
 #~ "dependencies"
 #~ msgstr ""
 #~ "Dotyczy kolekcji: instalacja lub usuwanie nie zainstaluje/usunie pakietów "
 #~ "zależnych"
+
 #~ msgid "Architectures"
 #~ msgstr "Systemy operacyjne"
+
 #~ msgid "Select architectures to support"
 #~ msgstr "Wybierz system operacyjny"
+
 #~ msgid "Reset changes"
 #~ msgstr "Anuluj zmiany"
+
 #~ msgid "Removals of the main architecture not possible!"
 #~ msgstr ""
 #~ "Usuwanie binariów dla głównego systemu operacyjnego jest niemożliwe!"
+
 #~ msgid "Configuration"
 #~ msgstr "Konfiguracja"
+
 #~ msgid "Default settings"
 #~ msgstr "Ustawienia domyślne"
+
 #~ msgid "Paper settings"
 #~ msgstr "Ustawienie formatu papieru"
+
 #~ msgid "Re-initialize file database"
 #~ msgstr "Przebudowanie baz danych ls-R"
+
 #~ msgid "Re-create all formats"
 #~ msgstr "Odbudowa wszystkich plików formatów"
+
 #~ msgid "Uninstallation"
 #~ msgstr "Odistalowanie"
+
 #~ msgid "Please use the \"Add/Remove Programs\" from the Control Panel!"
 #~ msgstr "Proszę użyć \"Dodaj/Usuń Programy\" w Panelu Sterowania!"
+
 #~ msgid ""
 #~ "Really remove the complete TeX Live %s installation?\n"
 #~ "Your last chance to change your mind!"
 #~ msgstr ""
 #~ "Naprawdę usunąć całą instalację TeX Live %s?\n"
 #~ "Nie będzie więcej zapytań!"
+
 #~ msgid "Current package repository:"
 #~ msgstr "Aktualne repozytorium pakietów:"
-#~ msgid "Load"
-#~ msgstr "Wczytaj"
+
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr ""
 #~ "Naciśnij ten przycisk, aby wczytać bazę danych z danego repozytorium."
+
 #~ msgid ""
 #~ "Change package repository from where packages are fetched at installation "
 #~ "and update time."
 #~ msgstr "Zmień repozytorium pakietów dla instalacji i aktualizacji."
+
 #~ msgid "Debug"
 #~ msgstr "debug"
+
 #~ msgid "Turn on debug mode."
 #~ msgstr "Włącz tryb debug."
+
 #~ msgid "Adding packages"
 #~ msgstr "Dodawanie pakietów"
+
 #~ msgid "Install selected"
 #~ msgstr "Instacja zaznaczonych pakietów"
+
 #~ msgid ""
 #~ "The database of the package repository has not been loaded.\n"
 #~ "\n"
@@ -1668,20 +1776,28 @@ msgstr "Pakiety dla XeTeX"
 #~ "Baza danych repozytorium pakietów nie została wczytana.\n"
 #~ "\n"
 #~ "Użyj przycisków \"Wczytaj\" (ew. także \"Zmień\")."
+
 #~ msgid "Updating packages"
 #~ msgstr "Aktualizacja pakietów"
+
 #~ msgid "Update all"
 #~ msgstr "Aktualizuj wszystko"
+
 #~ msgid "Update selected"
 #~ msgstr "Aktualizuj wybrane"
+
 #~ msgid "Removing packages"
 #~ msgstr "Usuwanie pakietów"
+
 #~ msgid "Remove selected"
 #~ msgstr "Usuń zaznaczone"
+
 #~ msgid "Please click on an item on the left for details"
 #~ msgstr "Wskaż pozycję po lewej, aby uzyskać informację"
+
 #~ msgid "...please change me..."
 #~ msgstr "...proszę zmienić..."
+
 #~ msgid ""
 #~ "No updates found.\n"
 #~ "\n"
@@ -1704,8 +1820,10 @@ msgstr "Pakiety dla XeTeX"
 #~ "\n"
 #~ "Jeśli chcesz zmienić to ustawienie na stałe, przejdź do zakładki "
 #~ "\"Konfiguracja\" i zmień domyślne repozytorium instalacji."
+
 #~ msgid "Everything up-to-date!"
 #~ msgstr "Wszystko jest aktualne!"
+
 #~ msgid ""
 #~ "Updates for the tlmgr are present.\n"
 #~ "Installation and upgrades won't work without being forced.\n"
@@ -1718,28 +1836,38 @@ msgstr "Pakiety dla XeTeX"
 #~ "Przejdź do ekranu aktualizacji i naciśnij \"aktualizuj wszystko\".\n"
 #~ "Program zakończy działanie po zaktualizowaniu tlmgr.\n"
 #~ "Uruchom ponownie program, aby dokonać dalszych aktualizacji."
+
 #~ msgid "Change package repository"
 #~ msgstr "Zmień repozytorium pakietów"
+
 #~ msgid "New package repository:"
 #~ msgstr "Nowe repozytorium pakietów:"
+
 #~ msgid "Warning Window"
 #~ msgstr "Okno ostrzeżeń"
+
 #~ msgid "Use letter size instead of A4 by default"
 #~ msgstr "Domyślny format papieru letter zamiast A4"
+
 #~ msgid "pattern:"
 #~ msgstr "wzorzec:"
+
 #~ msgid "Architectures ..."
 #~ msgstr "Systemy operacyjne..."
 
 #, fuzzy
 #~ msgid "Update LuaTeX font database"
 #~ msgstr "Aktualizuj mapy fontowe"
+
 #~ msgid "File"
 #~ msgstr "Plik"
+
 #~ msgid "%s collections out of %s (disk space required: %s MB)"
 #~ msgstr "%s Kolekcje spośród %s (wymagana przestrzeń na dysku: %s MB)"
+
 #~ msgid "(use ~ for %%%)"
 #~ msgstr "(użyj ~ dla %%%)"
+
 #~ msgid ""
 #~ "Please run this program as administrator, or contact your local admin.\n"
 #~ "\n"
@@ -1749,16 +1877,21 @@ msgstr "Pakiety dla XeTeX"
 #~ "administratorem.\n"
 #~ "\n"
 #~ "Większość opcji zostanie zablokowana."
+
 #~ msgid "Select set of supported architectures"
 #~ msgstr "Zaznacz zestaw dla innych systemów operacyjnych"
+
 #~ msgid "Change Location"
 #~ msgstr "Zmień lokalizację repozytorium "
+
 #~ msgid "Select architectures to be added (removal not possible)"
 #~ msgstr "Zaznacz systemy operacyjne do dodania (usuwanie niemożliwe)"
+
 #~ msgid "Default installation source"
 #~ msgstr "Domyślne źródło instalacji"
+
 #~ msgid "New default installation source"
 #~ msgstr "Nowe domyślne źródło instalacji"
+
 #~ msgid "Current installation source:"
 #~ msgstr "Aktualne źródło instalacji:"
-
diff --git a/Master/tlpkg/translations/ru.po b/Master/tlpkg/translations/ru.po
index 6f5baf235f5..6fbc5c04d80 100644
--- a/Master/tlpkg/translations/ru.po
+++ b/Master/tlpkg/translations/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-08-26 14:31+0900\n"
 "Last-Translator: Vladimir Lomov <irk.translator@gmail.com>\n"
 "Language-Team: Russian <tex-live@tug.org>\n"
@@ -18,24 +18,25 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.2\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Установка TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -51,21 +52,26 @@ msgstr "Установка TeX Live %s"
 msgid "Cancel"
 msgstr "Отмена"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Назад"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Далее >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -84,32 +90,73 @@ msgstr ""
 "Для тонкой, настраиваемой установки просмотрите, пожалуйста,\n"
 "web-страницы или руководство по установке."
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "Или используйте install-tl-advanced.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: tlpkg/installer/install-menu-wizard.pl:194
 msgid "Or use the argument --gui expert to install-tl."
 msgstr "Или используйте опцию --gui expert для install-tl."
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Папка назначения:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -124,7 +171,7 @@ msgstr "Папка назначения:"
 msgid "Change"
 msgstr "Изменить"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -132,32 +179,32 @@ msgstr ""
 "Папка назначения будет содержать установленные файлы.\n"
 "Настоятельно рекомендуем сохранить год выпуска дистрибутива в её названии."
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr "требуется места на диске:"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
-"(в каталог по умолчанию писать нельзя - пожалуйста, задайте другое "
-"значение)"
+"(в каталог по умолчанию писать нельзя - пожалуйста, задайте другое значение)"
 
-#: tlpkg/installer/install-menu-wizard.pl:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Введите путь для"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -181,41 +228,41 @@ msgstr "Введите путь для"
 msgid "Ok"
 msgstr "Ок"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "Формат страницы по умолчанию"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr "Добавить пункты меню"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Изменить привязку файлов"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "Добавить в переменную PATH"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Установка для всех пользователей"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr "Это окно позволяет вам настроить некоторые параметры"
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -228,62 +275,62 @@ msgstr ""
 "Если вы хотите изменить что-нибудь, нажмите кнопку \"Назад\",\n"
 "если нет, нажмите кнопку \"Установить\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Да"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "Нет"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Установить"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -298,8 +345,8 @@ msgstr ""
 "всему миру; поддержите, пожалуйста, проект, присоединившись к подходящей вам "
 "группе. Список групп доступен на странице http://tug.org/usergroups.html."
 
-#: tlpkg/installer/install-menu-wizard.pl:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -312,8 +359,8 @@ msgstr ""
 "Самое главное, добавьте %s/bin/%s\n"
 "к вашему PATH для текущей и будущих сессий."
 
-#: tlpkg/installer/install-menu-wizard.pl:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -321,88 +368,120 @@ msgstr ""
 "В процессе установки появлялось несколько предупреждений.\n"
 "Здесь список этих предупреждений:"
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "Добро пожаловать в TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Конец"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Нет"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Только новые"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Все"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "А4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "Letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Загрузить"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Основная информация"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Программы для систем"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Выбранная схема"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Дальнейшая настройка"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Стандартные коллекции"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Коллекции языков"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Подготовка каталогов"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "Настройка для переносимой системы (например, на флешке USB)"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -411,172 +490,159 @@ msgstr "Настройка для переносимой системы (нап�
 msgid "Toggle"
 msgstr "Переключить"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (основной каталог TeX)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (каталог локальных файлов системы)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (каталог автоматически создаваемых данных)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (каталог локальных настроек)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (каталог пользовательских данных)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Параметры"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Позволить выполнение ограниченного набора программ через \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Создать все форматные файлы"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Установить дерево с документацией font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Установить дерево исходных файлов font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Создать ссылки в системных каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Установить редактор TeXworks"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Установить TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Выход"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "Процесс установки"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Изменить значение переменной"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Введите путь для %s (используйте ~ для %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "выбор коллекций"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Выберите устанавливаемые коллекции"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Выбрать всё"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Снять выделение"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Выберите языковую поддержку"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Выберите документацию на определённом языке"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "создать символьные ссылки в стандартных каталогах"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "программы в"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "страницы man в"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "страницы info в"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Выберите архитектуру-ОС"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 msgid "Removals of the main platform not possible!"
 msgstr "Удаление основной архитектуры невозможно!"
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s из %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s коллекций из %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(не выбрана коллекция языков!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(пожалуйста, сначала измените TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(по умолчанию: нет прав на запись - пожалуйста измените!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1688,9 +1754,6 @@ msgstr "Пакеты XeTeX"
 #~ msgid "Current package repository:"
 #~ msgstr "Текущий репозиторий пакетов"
 
-#~ msgid "Load"
-#~ msgstr "Загрузить"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr ""
 #~ "Нажмите эту кнопку, чтобы загрузить базу данных из репозитория пакетов."
diff --git a/Master/tlpkg/translations/sk.po b/Master/tlpkg/translations/sk.po
index 545157b4100..532d6470549 100644
--- a/Master/tlpkg/translations/sk.po
+++ b/Master/tlpkg/translations/sk.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-06-15 18:41+0100\n"
 "Last-Translator: Ján Buša <jan.busa@tuke.sk>\n"
 "Language-Team:  <tex-live@tug.org>\n"
@@ -13,24 +13,25 @@ msgstr ""
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Inštalácia TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -46,21 +47,26 @@ msgstr "Inštalácia TeX Live %s"
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Späť"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Ďalej >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -79,32 +85,73 @@ msgstr ""
 "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:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "Prípadne  použite install-tl-advanced.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: 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."
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Cieľový adresár:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -119,7 +166,7 @@ msgstr "Cieľový adresár:"
 msgid "Change"
 msgstr "Zmeniť"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -127,32 +174,33 @@ msgstr ""
 "Cieľový adresár bude obsahovať inštaláciu.\n"
 "Dôrazne vám odporúčame ponechať rok ako poslednú zložku."
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr "požadovaný diskový priestor:"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 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:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Vložte cestu pre"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -176,41 +224,41 @@ msgstr "Vložte cestu pre"
 msgid "Ok"
 msgstr "OK"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "Predvolený rozmer papiera"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr "Pridať skratky ponuky"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Zmeniť priradenia súborov"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "Upraviť nastavenie PATH v registroch"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Inštalácia pre všetkých používateľov"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 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:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -223,62 +271,62 @@ 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:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Áno"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "Nie"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Nainštalovať"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -294,8 +342,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:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -308,8 +356,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:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -317,88 +365,120 @@ 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:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "Vitajte vo svete TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Dokončiť"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Žiaden"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Len nové"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Všetky"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Načítať"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Varovanie"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Základné informácie"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Binárny(e) systém(y)"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Zvolená schéma"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Ďalšie prispôsobenie"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Štandardné zbierky"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Jazykové zbierky"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Nastavenie adresára"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "Prenosné nastavenie"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -407,174 +487,161 @@ msgstr "Prenosné nastavenie"
 msgid "Toggle"
 msgstr "Prepnúť"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (hlavný TeXovský adresár)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (adresár na umiestnenie lokálnych súborov)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (adresár vygenerovaných súborov)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (adresár pre lokálnu konfiguráciu)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (adresár užívateľských súborov)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Voľby"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 "Umožniť vykonanie všeobecne neprístupných zoznamov programov prostredníctvom "
 "\\write 18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Vytvoriť všetky formátové súbory"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Nainštalovať strom dokumentácie fontov/makier"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Nainštalovať strom zdrojových súborov fontov/makier"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Vytvoriť symbolické odkazy v systémových adresároch"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Nainštalovať pomocný program TeXworks"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Nainštalovať TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "Proces inštalácie"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Zmeniť hodnotu premennej"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, 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:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "používateľská voľba zbierok"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Zvoliť kolekcie, ktore majú byť nainštalované."
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Zvoliť všetky"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Zrušiť všetky voľby"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Zvoliť podporu jazyka"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Zvoliť dokumentáciu pre jednotlivé jazyky"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "vytvoriť symbolické linky v štandardných adresároch"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "binárky do"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "dokumentáciu manpages do"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "informáciu do"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Zvoliť architektúru resp. operačný systém"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Varovanie"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 msgid "Removals of the main platform not possible!"
 msgstr "Odstránenie hlavnej platformy nie je možné!"
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s kolekcií z %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(nebola zvolená jazyková kolekcia!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(zmeňte najprv TEXDIR, prosím!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(predvolené miesto neumožňuje zápis - zmeňte, prosím!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1680,9 +1747,6 @@ msgstr "Balíky XeTeXu"
 #~ msgid "Current package repository:"
 #~ msgstr "Aktuálna schránka balíkov:"
 
-#~ msgid "Load"
-#~ msgstr "Načítať"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr " Na načítanie databázy zo schránky balíkov stlačte toto tlačidlo."
 
diff --git a/Master/tlpkg/translations/sl.po b/Master/tlpkg/translations/sl.po
index 6dbd82db50d..dcb044112c1 100644
--- a/Master/tlpkg/translations/sl.po
+++ b/Master/tlpkg/translations/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2009 Translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-06-28 03:29+0100\n"
 "Last-Translator: Mojca Miklavec <mojca.miklavec.lists@gmail.com>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -13,24 +13,25 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Bookmarks: 77,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Namestitev TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -46,21 +47,26 @@ msgstr "Namestitev TeX Live %s"
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Nazaj"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Naprej >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -79,33 +85,74 @@ msgstr ""
 "Za napredne dodatne nastavitve se obrnite na\n"
 "spletno stran ali namestitveni vodič (installation guide)."
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "Lahko uporabite install-tl-advanced.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: tlpkg/installer/install-menu-wizard.pl:194
 #, fuzzy
 msgid "Or use the argument --gui expert to install-tl."
 msgstr "Lahko uporabite opcijo \"--gui perltk\" za install-tl."
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Ciljni imenik:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -120,7 +167,7 @@ msgstr "Ciljni imenik:"
 msgid "Change"
 msgstr "Spremeni"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 #, fuzzy
 msgid ""
 "The destination folder will contain the installation.\n"
@@ -129,31 +176,32 @@ msgstr ""
 "Namestitev bo opravljena v ciljni imenik.\n"
 "Priporočljivo je uporabiti letnico na koncu imena."
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 #, fuzzy
 msgid "disk space required:"
 msgstr "prostor na disku:"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 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:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Nastavite pot do"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -177,21 +225,21 @@ msgstr "Nastavite pot do"
 msgid "Ok"
 msgstr "V redu"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "Privzet format papirja"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 #, fuzzy
 msgid "Add menu shortcuts"
 msgstr "Dodajne menijske bližnjice"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
@@ -199,22 +247,22 @@ msgstr "Dodajne menijske bližnjice"
 msgid "Change file associations"
 msgstr "Spremeni asociacije končnic datotek"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 #, fuzzy
 msgid "Adjust PATH setting in registry"
 msgstr "Nastavi pot (PATH) v registru"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Namestitev za vse uporabnike"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr "Ta zaslon omogoča nastavitev nekaterih opcij"
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -227,62 +275,62 @@ msgstr ""
 "Če bi radi karkoli spremenili, se vrnite nazaj,\n"
 "sicer pritisnite gumb \"Namesti\"."
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Da"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "Ne"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Namesti"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -298,8 +346,8 @@ msgstr ""
 "Seznam društev uporabnikov TeX-a je na voljo na http://tug.org/usergroups."
 "html."
 
-#: tlpkg/installer/install-menu-wizard.pl:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, fuzzy, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -312,8 +360,8 @@ msgstr ""
 "%s/texmf/doc/info v spremenljivko INFOPATH ter najpomembneje -\n"
 "%s/bin/%s v spremenljivko PATH."
 
-#: tlpkg/installer/install-menu-wizard.pl:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 #, fuzzy
 msgid ""
 "There were some warnings during the installation process.\n"
@@ -322,89 +370,121 @@ msgstr ""
 "Med namestitvijo je prišlo do manjših težav.\n"
 "Tu je seznam opozoril:"
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "Dobrodošli v TeX Live-u!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Konec"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 #, fuzzy
 msgid "None"
 msgstr "Brez"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Samo nove"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Vse"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Opozorilo"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Osnovne nastavitve"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Izbrani operacijski sistemi in arhitekture"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Izbrana shema"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Napredne nastavitve"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Standardne zbirke"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Podpora jezikom"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Nastavitve imenikov"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "Prenosljiva namestitev"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -413,175 +493,162 @@ msgstr "Prenosljiva namestitev"
 msgid "Toggle"
 msgstr "Vključi/Izključi"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (vrhnji TeX direktorij)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (lokalne datoteke)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (samodejno generirane datoteke)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (lokalna konfiguracija)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (uporabnikove datoteke)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Možnosti"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Dovoli izvajanje omejenega števila programov z \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Generiraj vse formate"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Namesti dokumentacijo za pisave in makre"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Namesti izvorno kodo za pisave in makre"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Namesti simbolne povezave v sistemske mape"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Namesti urejevalnik TeXworks"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Namesti TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Izhod"
 
 # 1. zavihek
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 #, fuzzy
 msgid "Installation process"
 msgstr "Potek namestitve"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Nova vrednost spremenljivke"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, 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:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "namestitev paketov po izbiri"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Zbirke, ki naj se namestijo"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Briši izbor"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Jezikovni paketi in delilni vzorci"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Prevodi dokumentacije"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "ustvari simbolne povezave v sistemskih imenikih"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "binarne datoteke v"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "'man' strani v"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "info strani v"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Izbrane platforme"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Opozorilo"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 #, 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:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s od %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s zbirk od %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(Nobena jezikovna zbirka ni izbrana!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(Spremenite TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(Spremenite imenik - pisanje v izbrani imenik je zaščiteno!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
diff --git a/Master/tlpkg/translations/sr.po b/Master/tlpkg/translations/sr.po
index 5ad4efc26d0..02c7d6dd0fe 100644
--- a/Master/tlpkg/translations/sr.po
+++ b/Master/tlpkg/translations/sr.po
@@ -6,33 +6,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tex Live 2011 Serbian Translation 20110618\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-06-18 20:43+0200\n"
 "Last-Translator: Nikola Lečić <nikola.lecic@anthesphoria.net>\n"
 "Language-Team: Serbian/Cyrillic <tex-live@tug.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s: инсталација"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -48,21 +50,26 @@ msgstr "TeX Live %s: инсталација"
 msgid "Cancel"
 msgstr "Прекини"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Назад"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Напред >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -81,32 +88,73 @@ msgstr ""
 "Ако желите напредну инсталацију са више могућности подешавања,\n"
 "погледајте странице на Интернету или Приручник."
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "Можете да употребите и install-tl-advanced.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: tlpkg/installer/install-menu-wizard.pl:194
 msgid "Or use the argument --gui expert to install-tl."
 msgstr "Или, позовите скрипту install-tl са параметром --gui expert."
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Циљни директоријум:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -121,7 +169,7 @@ msgstr "Циљни директоријум:"
 msgid "Change"
 msgstr "Промени"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -129,30 +177,31 @@ msgstr ""
 "Директоријум у који ће се сместити инсталирани материјал.\n"
 "Препоручујемо да задржите годину као последњи члан."
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr "потребан простор на диску:"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 msgid "(default not allowed or not writable - please change!)"
 msgstr "(подразумевани директоријум је неуписив - промените га!)"
 
-#: tlpkg/installer/install-menu-wizard.pl:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Унесите путању за"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -176,41 +225,41 @@ msgstr "Унесите путању за"
 msgid "Ok"
 msgstr "У реду"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "Подразумевана величина папира"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr "Додати пречице у менију"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Повежи типове фајлова са одговарајућим програмима"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "Подеси PATH вредност у Registry"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "Инсталација за све кориснике"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr "На овом екрану можете да подесите неке параметре"
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -223,62 +272,62 @@ msgstr ""
 "Ако желите да нешто промените, вратите се назад,\n"
 "иначе притисните дугме „Инсталирај“."
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "да"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "не"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Инсталирај"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -294,8 +343,8 @@ msgstr ""
 "подршке путем прикључивања групи која Вам највише одговара. Списак група "
 "налази се на Интернет-страници http://tug.org/usergroups.html."
 
-#: tlpkg/installer/install-menu-wizard.pl:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -308,8 +357,8 @@ msgstr ""
 "Најважније од свега, додајте %s/bin/%s\n"
 "у PATH путању за тренутну и све будуће сесије."
 
-#: tlpkg/installer/install-menu-wizard.pl:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -317,88 +366,120 @@ msgstr ""
 "Било је неких упозорења током инсталационог процеса.\n"
 "Следи преглед тих порука:"
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "Добродошли у TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Заврши"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Ништа"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Само нови"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Све"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Учитај"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Упозорење"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Основни подаци"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Платформе (тј. архитектуре и оперативни системи) за програме"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Изабрана шема"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Додатна подешавања"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Стандардне колекције"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Језичке колекције"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Подешавање директоријума"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "Преносива инсталација"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -407,174 +488,161 @@ msgstr "Преносива инсталација"
 msgid "Toggle"
 msgstr "Обрни"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (главни TeX директоријум)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (директоријум за општеважеће локалне фајлове)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (директоријум за аутоматски направљене податке)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (директоријум за локална подешавања)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (директоријум за корисникове фајлове)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Подешавања"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Дозволи покретање ограничене листе програма путем \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Направи све фајлове са форматима"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Инсталирај документацију за фонтове и макрое"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Инсталирај изворни код фонтова и макроа"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Направи симболичке линкове у системским директоријумима"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Инсталирај специјализовани едитор TeXworks"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Инсталирај TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Напусти програм"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "Процес инсталације"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Промена вредности променљиве"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "Унесите путању за %s (употребите ~ као замену за %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "произвољан избор колекција"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Изаберите колекције које ће бити инсталиране"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Изабери све"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Уклони све ознаке"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Изаберите језичку подршку"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Изаберите превод документације"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "Направи симболичке линкове у стандардним директоријумима"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "Стави бинарне фајлове у"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "Стави man странице у"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "Стави info странице у"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr ""
 "Изаберите платформу\n"
 "(архитектура - оперативни систем)"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Упозорење"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 msgid "Removals of the main platform not possible!"
 msgstr "Уклањање главне платформе није могуће!"
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s од укупно %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, perl-format
 msgid "%s collections out of %s"
 msgstr "%s колекција од укупно %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(није одабрана ниједна језичка колекција!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(прво промените TEXDIR!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(није могуће уписивање на подразумевану локацију - промените је!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1683,9 +1751,6 @@ msgstr "XeTeX пакети"
 #~ msgid "Current package repository:"
 #~ msgstr "Трекући репозиторијум пакета:"
 
-#~ msgid "Load"
-#~ msgstr "Учитај"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr ""
 #~ "Притисните ово дугме да учитате базу података из репозиторијума пакета."
diff --git a/Master/tlpkg/translations/vi.po b/Master/tlpkg/translations/vi.po
index bfb006294f1..9184f096b85 100644
--- a/Master/tlpkg/translations/vi.po
+++ b/Master/tlpkg/translations/vi.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2009 Translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-04-28 04:16+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+0200\n"
 "PO-Revision-Date: 2011-06-23 21:47+0700\n"
 "Last-Translator: Anh K. Huỳnh <kyanh@viettug.org>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -15,24 +15,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "Cài đặt TeX Live %s"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -48,21 +49,26 @@ msgstr "Cài đặt TeX Live %s"
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< Quay lại"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "Tiếp theo >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -81,32 +87,73 @@ msgstr ""
 "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:191
+#: 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"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: 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."
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "Cài đặt vào thư mục:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -121,7 +168,7 @@ msgstr "Cài đặt vào thư mục:"
 msgid "Change"
 msgstr "Thay đổi"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -130,30 +177,31 @@ msgstr ""
 "Khuyến cáo: bạn nên để năm (ví dụ: 2009, 2008) vào cuối đường dẫn để phân "
 "biệt các bộ cài đặt khác nhau."
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 msgid "disk space required:"
 msgstr "dung lượng đĩa cần thiết:"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 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:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "Nhập đường dẫn cho"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -177,41 +225,41 @@ msgstr "Nhập đường dẫn cho"
 msgid "Ok"
 msgstr "Đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr "Kiểu giấy mặc định"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr "Thêm liên kết nhanh vào menu"
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "Đổi tương ứng tập tin - chương trình"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 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:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 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:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 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:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -224,62 +272,62 @@ 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:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "Đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "Không đồng ý"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "Cài đặt"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -295,8 +343,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:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -309,8 +357,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:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
@@ -318,88 +366,120 @@ 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:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "Chào mừng đến với TeX Live!"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "Kết thúc"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "Không"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "Chỉ cái mới"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "Tất cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr "A4"
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "thư"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "Nạp"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "Cảnh báo"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "Thông tin cơ bản"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "Hệ thống nhị phân"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "Nhóm đã chọn"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "Tùy chỉnh khác"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "Các tập hợp chuẩn"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "Các bộ ngôn ngữ"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "Thiết lập thư mục"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr "Cài đặt linh hoạt (có thể dùng ở máy khác)"
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -408,175 +488,163 @@ msgstr "Cài đặt linh hoạt (có thể dùng ở máy khác)"
 msgid "Toggle"
 msgstr "Hoán đổi"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (thư mục TeX chính)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr ""
 "TEXMFLOCAL (thư mục cho các gói, phần bổ sung cho TeX; thư mục này dành cho "
 "hệ thống TeX ở địa phương)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr ""
 "TEXMFSYSVAR (thư mục cho các tập tin tạm thời được sinh ra khi biên dịch tài "
 "liệu)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (thư mục cho cấu hình cục bộ)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (thư mục cho người dùng lưu trữ các gói, tập tin bổ sung)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "Cho phép thực thi một số chương trình của hệ thống bằng \\write18"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "Tạo mọi tập tin định dạng (TeX format)"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "Cài đặt tài liệu cho font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "Cài đặt mã nguồn của font/macro"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "Tạo liên kết vào các thư mục hệ thống"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "Cài đặt trình soạn thảo TeXworks"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "Cài đặt TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "Thoát"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "Tiến trình cài đặt"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "Đổi giá trị biến"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, 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:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr "tự chọn các nhóm"
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "Chọn nhóm sẽ được cài đặt"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "Chọn tất cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "Không chọn gì cả"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "Chọn ngôn ngữ hỗ trợ"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "Chọn tài liệu ứng với ngôn ngữ"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 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:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "tập tin thi hành vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "tập tin hướng dẫn (man) vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "tập tin hướng dẫn (info) vào"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "Chọn kiểu hệ thống"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "Cảnh báo"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 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:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s trên %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
+#, perl-format
 msgid "%s collections out of %s"
 msgstr "%s nhóm trong tổng số %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(chưa chọn nhóm ngôn ngữ nào!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(vui lòng đổi thư mục TEXDIR trước!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(mặc định không ghi được - vui lòng đổi!)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1677,9 +1745,6 @@ msgstr "Các gói cho XeTeX"
 #~ msgid "Current package repository:"
 #~ msgstr "Nguồn cài đặt hiện tại:"
 
-#~ msgid "Load"
-#~ msgstr "Nạp"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr "Nhấn nút này để nạp dữ liệu từ nguồn cài đặt gói."
 
diff --git a/Master/tlpkg/translations/zh-cn.po b/Master/tlpkg/translations/zh-cn.po
index 283ca0124ec..6b2a05f696a 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 2009 Translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+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"
@@ -12,24 +12,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s 安装"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -45,21 +46,26 @@ msgstr "TeX Live %s 安装"
 msgid "Cancel"
 msgstr "取消"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr "< 上一步"
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr "下一步 >"
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -77,33 +83,74 @@ msgstr ""
 "\n"
 "要使用更强大、可定制的安装，请参考网页或安装指南。"
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr "或者使用 install-tl-advanced.bat"
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: tlpkg/installer/install-menu-wizard.pl:194
 #, fuzzy
 msgid "Or use the argument --gui expert to install-tl."
 msgstr "或者使用 install-tl 的 --gui perltk 参数。"
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr "目的文件夹:"
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -118,7 +165,7 @@ msgstr "目的文件夹:"
 msgid "Change"
 msgstr "修改"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
@@ -126,31 +173,32 @@ msgstr ""
 "将包含整个安装的目的文件夹。\n"
 "强烈建议以年份作为最后的目录项。"
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 #, fuzzy
 msgid "disk space required:"
 msgstr "需要的磁盘空间"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "输入路径变量"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -174,42 +222,42 @@ msgstr "输入路径变量"
 msgid "Ok"
 msgstr "确定"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 #, fuzzy
 msgid "Default paper size"
 msgstr "缺省的纸张给"
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr "修改文件关联"
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr "修改注册表中的 PATH 设置"
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 msgid "Installation for all users"
 msgstr "为所有用户安装"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr "这个界面允许你配置某些选项"
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -221,62 +269,62 @@ msgstr ""
 "将使用下列选项。\n"
 "如果你还想修改什么请后退，否则点击“安装”按钮。"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "是"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 msgid "Install"
 msgstr "安装"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -291,8 +339,8 @@ msgstr ""
 "请考虑加入合适的 TeX 用户组来支持该项目。从\n"
 "http://tug.org/usergroups.html 可以获得 TeX 用户组的列表。"
 
-#: tlpkg/installer/install-menu-wizard.pl:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -305,95 +353,127 @@ msgstr ""
 "最为重要的是，请添加 %s/bin/%s\n"
 "到你的 PATH 变量。"
 
-#: tlpkg/installer/install-menu-wizard.pl:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "欢迎进入 TeX Live 的世界！"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "完成"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 msgid "None"
 msgstr "无"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr "只有新的"
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr "全部的"
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr "letter"
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr "载入"
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr "警告"
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "基本信息"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "二进制系统"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "选择安装方案"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "进一步定制"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "标准安装"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "语言集合"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "目录设置"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -402,173 +482,160 @@ msgstr ""
 msgid "Toggle"
 msgstr "切换"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (主 TeX 目录)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (存放本地格式文件等)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (存放自动生成数据的目录)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (存放本地配置)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFHOME (用户专有文件的目录)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "选项"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr "允许用 \\write18 执行一部分在限制列表内的程序"
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "创建所有格式文件"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "安装字体/宏包文档目录树"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "安装字体/宏包源码目录树"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "创建指向系统目录的符号链接"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 msgid "Install TeXworks front end"
 msgstr "安装 TeXworks 前端"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 msgid "Install TeX Live"
 msgstr "安装 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "退出"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 msgid "Installation process"
 msgstr "安装过程"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "更改变量的值"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "输入 %s 对应的路径 (使用 ~ 作为 %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "选择要安装的组件"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "全部选择"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "取消全部选择"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "选择语言支持"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "选择相关语言的文档"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "在标准位置创建符号链接"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "程序文件安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "手册文档(*.man)安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "超文本文档(*.info)安装位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "选择系统架构"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr "警告"
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 #, fuzzy
 msgid "Removals of the main platform not possible!"
 msgstr "不可能删除主架构文件！"
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s  来自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s 集合来自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(没有选择语言集合！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(请首先改变 TEXDIR ！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(默认位置不可写 - 请做相应更改！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"
@@ -1652,9 +1719,6 @@ msgstr ""
 #~ msgid "Current package repository:"
 #~ msgstr "当前的软件包仓库:"
 
-#~ msgid "Load"
-#~ msgstr "载入"
-
 #~ msgid "Press this button to load the database from the package repository."
 #~ msgstr "点击这个按钮来从软件包仓库中载入数据库"
 
diff --git a/Master/tlpkg/translations/zh-tw.po b/Master/tlpkg/translations/zh-tw.po
index 96bbf94abb8..00575d2e855 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 2009 Translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2011-06-18 04:12+0200\n"
+"POT-Creation-Date: 2011-09-13 04:23+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"
@@ -12,24 +12,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: tlpkg/installer/install-menu-wizard.pl:148
-#: tlpkg/installer/install-menu-perltk.pl:177
+#: tlpkg/installer/install-menu-wizard.pl:150
+#: tlpkg/installer/install-menu-perltk.pl:237
 #, perl-format
 msgid "TeX Live %s Installation"
 msgstr "TeX Live %s 安裝"
 
-#: tlpkg/installer/install-menu-wizard.pl:163
-#: tlpkg/installer/install-menu-wizard.pl:289
-#: tlpkg/installer/install-menu-wizard.pl:502
-#: tlpkg/installer/install-menu-perltk.pl:414
-#: tlpkg/installer/install-menu-perltk.pl:498
-#: tlpkg/installer/install-menu-perltk.pl:530
-#: tlpkg/installer/install-menu-perltk.pl:568
-#: tlpkg/installer/install-menu-perltk.pl:623
-#: tlpkg/installer/install-menu-perltk.pl:677
-#: tlpkg/installer/install-menu-perltk.pl:761
-#: tlpkg/installer/install-menu-perltk.pl:825
-#: tlpkg/installer/install-menu-perltk.pl:856
+#: tlpkg/installer/install-menu-wizard.pl:165
+#: tlpkg/installer/install-menu-wizard.pl:387
+#: tlpkg/installer/install-menu-wizard.pl:505
+#: tlpkg/installer/install-menu-wizard.pl:718
+#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-perltk.pl:628
+#: tlpkg/installer/install-menu-perltk.pl:660
+#: tlpkg/installer/install-menu-perltk.pl:698
+#: tlpkg/installer/install-menu-perltk.pl:753
+#: tlpkg/installer/install-menu-perltk.pl:807
+#: tlpkg/installer/install-menu-perltk.pl:891
+#: tlpkg/installer/install-menu-perltk.pl:955
+#: tlpkg/installer/install-menu-perltk.pl:986
 #: texmf/scripts/texlive/tlmgrgui.pl:584 texmf/scripts/texlive/tlmgrgui.pl:585
 #: texmf/scripts/texlive/tlmgrgui.pl:995
 #: texmf/scripts/texlive/tlmgrgui.pl:1198
@@ -45,21 +46,26 @@ msgstr "TeX Live %s 安裝"
 msgid "Cancel"
 msgstr "取消"
 
-#: tlpkg/installer/install-menu-wizard.pl:165
-#: tlpkg/installer/install-menu-wizard.pl:257
-#: tlpkg/installer/install-menu-wizard.pl:411
-#: tlpkg/installer/install-menu-wizard.pl:456
+#: tlpkg/installer/install-menu-wizard.pl:167
+#: tlpkg/installer/install-menu-wizard.pl:274
+#: tlpkg/installer/install-menu-wizard.pl:342
+#: tlpkg/installer/install-menu-wizard.pl:397
+#: tlpkg/installer/install-menu-wizard.pl:473
+#: tlpkg/installer/install-menu-wizard.pl:627
+#: tlpkg/installer/install-menu-wizard.pl:672
 msgid "< Back"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:166
-#: tlpkg/installer/install-menu-wizard.pl:196
-#: tlpkg/installer/install-menu-wizard.pl:258
-#: tlpkg/installer/install-menu-wizard.pl:412
+#: tlpkg/installer/install-menu-wizard.pl:168
+#: tlpkg/installer/install-menu-wizard.pl:209
+#: tlpkg/installer/install-menu-wizard.pl:275
+#: tlpkg/installer/install-menu-wizard.pl:343
+#: tlpkg/installer/install-menu-wizard.pl:474
+#: tlpkg/installer/install-menu-wizard.pl:628
 msgid "Next >"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:188
+#: tlpkg/installer/install-menu-wizard.pl:190
 #, perl-format
 msgid ""
 "Welcome to the installation of TeX Live %s\n"
@@ -71,32 +77,73 @@ msgid ""
 "the web pages or installation guide."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:191
+#: tlpkg/installer/install-menu-wizard.pl:193
 msgid "Or use install-tl-advanced.bat"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:192
+#: tlpkg/installer/install-menu-wizard.pl:194
 msgid "Or use the argument --gui expert to install-tl."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:207
-#: tlpkg/installer/install-menu-wizard.pl:437
+#: tlpkg/installer/install-menu-wizard.pl:203
+msgid "Change default repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:257
+msgid "Mirror:"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:305
+msgid "Continent"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:319
+msgid "Countries"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:337
+msgid "Mirrors"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:383
+msgid "Please wait while the repository database is loaded."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:384
+msgid "This will take some time!"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:392
+#, perl-format
+msgid ""
+"The TeX Live versions of the local installation\n"
+"and the repository being accessed are not compatible:\n"
+"     local: %s\n"
+"repository: %s"
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:396
+msgid "Please go back and select a different mirror."
+msgstr ""
+
+#: tlpkg/installer/install-menu-wizard.pl:423
+#: tlpkg/installer/install-menu-wizard.pl:653
 msgid "Destination folder:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:190
-#: tlpkg/installer/install-menu-perltk.pl:199
-#: tlpkg/installer/install-menu-perltk.pl:209
-#: tlpkg/installer/install-menu-perltk.pl:215
-#: tlpkg/installer/install-menu-perltk.pl:237
-#: tlpkg/installer/install-menu-perltk.pl:239
-#: tlpkg/installer/install-menu-perltk.pl:248
-#: tlpkg/installer/install-menu-perltk.pl:255
-#: tlpkg/installer/install-menu-perltk.pl:262
-#: tlpkg/installer/install-menu-perltk.pl:269
-#: tlpkg/installer/install-menu-perltk.pl:318
+#: tlpkg/installer/install-menu-wizard.pl:425
+#: tlpkg/installer/install-menu-perltk.pl:315
+#: tlpkg/installer/install-menu-perltk.pl:324
 #: tlpkg/installer/install-menu-perltk.pl:334
+#: tlpkg/installer/install-menu-perltk.pl:340
+#: tlpkg/installer/install-menu-perltk.pl:362
+#: tlpkg/installer/install-menu-perltk.pl:364
+#: tlpkg/installer/install-menu-perltk.pl:373
+#: tlpkg/installer/install-menu-perltk.pl:380
+#: tlpkg/installer/install-menu-perltk.pl:387
+#: tlpkg/installer/install-menu-perltk.pl:394
+#: tlpkg/installer/install-menu-perltk.pl:443
+#: tlpkg/installer/install-menu-perltk.pl:459
 #: texmf/scripts/texlive/tlmgrgui.pl:1081
 #: texmf/scripts/texlive/tlmgrgui.pl:1115
 #: texmf/scripts/texlive/tlmgrgui.pl:1130
@@ -111,37 +158,38 @@ msgstr ""
 msgid "Change"
 msgstr "改變"
 
-#: tlpkg/installer/install-menu-wizard.pl:231
+#: tlpkg/installer/install-menu-wizard.pl:447
 msgid ""
 "The destination folder will contain the installation.\n"
 "It is strongly recommended to keep the year as the last component."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:253
-#: tlpkg/installer/install-menu-perltk.pl:910
+#: tlpkg/installer/install-menu-wizard.pl:469
+#: tlpkg/installer/install-menu-perltk.pl:1040
 #, fuzzy
 msgid "disk space required:"
 msgstr "需要的磁碟空間"
 
-#: tlpkg/installer/install-menu-wizard.pl:272
-#: tlpkg/installer/install-menu-perltk.pl:924
+#: tlpkg/installer/install-menu-wizard.pl:488
+#: tlpkg/installer/install-menu-perltk.pl:1054
 msgid "(default not allowed or not writable - please change!)"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:282
+#: tlpkg/installer/install-menu-wizard.pl:498
 msgid "Enter path for"
 msgstr "輸入路徑變數"
 
-#: tlpkg/installer/install-menu-wizard.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:497
-#: tlpkg/installer/install-menu-perltk.pl:528
-#: tlpkg/installer/install-menu-perltk.pl:553
-#: tlpkg/installer/install-menu-perltk.pl:621
-#: tlpkg/installer/install-menu-perltk.pl:661
-#: tlpkg/installer/install-menu-perltk.pl:745
-#: tlpkg/installer/install-menu-perltk.pl:823
-#: tlpkg/installer/install-menu-perltk.pl:854
-#: tlpkg/installer/install-menu-perltk.pl:871
+#: tlpkg/installer/install-menu-wizard.pl:502
+#: tlpkg/installer/install-menu-perltk.pl:292
+#: tlpkg/installer/install-menu-perltk.pl:627
+#: tlpkg/installer/install-menu-perltk.pl:658
+#: tlpkg/installer/install-menu-perltk.pl:683
+#: tlpkg/installer/install-menu-perltk.pl:751
+#: tlpkg/installer/install-menu-perltk.pl:791
+#: tlpkg/installer/install-menu-perltk.pl:875
+#: tlpkg/installer/install-menu-perltk.pl:953
+#: tlpkg/installer/install-menu-perltk.pl:984
+#: tlpkg/installer/install-menu-perltk.pl:1001
 #: texmf/scripts/texlive/tlmgrgui.pl:219 texmf/scripts/texlive/tlmgrgui.pl:584
 #: texmf/scripts/texlive/tlmgrgui.pl:588 texmf/scripts/texlive/tlmgrgui.pl:590
 #: texmf/scripts/texlive/tlmgrgui.pl:608 texmf/scripts/texlive/tlmgrgui.pl:787
@@ -165,42 +213,42 @@ msgstr "輸入路徑變數"
 msgid "Ok"
 msgstr "確定"
 
-#: tlpkg/installer/install-menu-wizard.pl:342
-#: tlpkg/installer/install-menu-perltk.pl:284
+#: tlpkg/installer/install-menu-wizard.pl:558
+#: tlpkg/installer/install-menu-perltk.pl:409
 msgid "Default paper size"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:343
-#: tlpkg/installer/install-menu-perltk.pl:326
+#: tlpkg/installer/install-menu-wizard.pl:559
+#: tlpkg/installer/install-menu-perltk.pl:451
 msgid "Add menu shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:344
-#: tlpkg/installer/install-menu-perltk.pl:332
-#: tlpkg/installer/install-menu-perltk.pl:539
-#: tlpkg/installer/install-menu-perltk.pl:544
+#: tlpkg/installer/install-menu-wizard.pl:560
+#: tlpkg/installer/install-menu-perltk.pl:457
+#: tlpkg/installer/install-menu-perltk.pl:669
+#: tlpkg/installer/install-menu-perltk.pl:674
 #: texmf/scripts/texlive/tlmgrgui.pl:1179
 #: texmf/scripts/texlive/tlmgrgui.pl:1520
 #: texmf/scripts/texlive/tlmgrgui.pl:1524
 msgid "Change file associations"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:345
-#: tlpkg/installer/install-menu-perltk.pl:313
+#: tlpkg/installer/install-menu-wizard.pl:561
+#: tlpkg/installer/install-menu-perltk.pl:438
 msgid "Adjust PATH setting in registry"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:346
-#: tlpkg/installer/install-menu-perltk.pl:339
+#: tlpkg/installer/install-menu-wizard.pl:562
+#: tlpkg/installer/install-menu-perltk.pl:464
 #, fuzzy
 msgid "Installation for all users"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-wizard.pl:361
+#: tlpkg/installer/install-menu-wizard.pl:577
 msgid "This screen allows you to configure some options"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:429
+#: tlpkg/installer/install-menu-wizard.pl:645
 #, perl-format
 msgid ""
 "We are ready to install TeX Live %s.\n"
@@ -209,63 +257,63 @@ msgid ""
 "otherwise press the \"Install\" button."
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1060
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1190
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "Yes"
 msgstr "是"
 
-#: tlpkg/installer/install-menu-wizard.pl:445
-#: tlpkg/installer/install-menu-perltk.pl:85
-#: tlpkg/installer/install-menu-perltk.pl:87
-#: tlpkg/installer/install-menu-perltk.pl:88
-#: tlpkg/installer/install-menu-perltk.pl:89
-#: tlpkg/installer/install-menu-perltk.pl:90
-#: tlpkg/installer/install-menu-perltk.pl:92
-#: tlpkg/installer/install-menu-perltk.pl:93
-#: tlpkg/installer/install-menu-perltk.pl:94
-#: tlpkg/installer/install-menu-perltk.pl:95
-#: tlpkg/installer/install-menu-perltk.pl:959
-#: tlpkg/installer/install-menu-perltk.pl:960
-#: tlpkg/installer/install-menu-perltk.pl:961
-#: tlpkg/installer/install-menu-perltk.pl:967
-#: tlpkg/installer/install-menu-perltk.pl:973
-#: tlpkg/installer/install-menu-perltk.pl:1050
-#: tlpkg/installer/install-menu-perltk.pl:1069
-#: tlpkg/installer/install-menu-perltk.pl:1070
-#: tlpkg/installer/install-menu-perltk.pl:1072
-#: tlpkg/installer/install-menu-perltk.pl:1088
+#: tlpkg/installer/install-menu-wizard.pl:661
+#: tlpkg/installer/install-menu-perltk.pl:119
+#: tlpkg/installer/install-menu-perltk.pl:121
+#: tlpkg/installer/install-menu-perltk.pl:122
+#: tlpkg/installer/install-menu-perltk.pl:123
+#: tlpkg/installer/install-menu-perltk.pl:124
+#: tlpkg/installer/install-menu-perltk.pl:126
+#: tlpkg/installer/install-menu-perltk.pl:127
+#: tlpkg/installer/install-menu-perltk.pl:128
+#: tlpkg/installer/install-menu-perltk.pl:129
+#: tlpkg/installer/install-menu-perltk.pl:1089
+#: tlpkg/installer/install-menu-perltk.pl:1090
+#: tlpkg/installer/install-menu-perltk.pl:1091
+#: tlpkg/installer/install-menu-perltk.pl:1097
+#: tlpkg/installer/install-menu-perltk.pl:1103
+#: tlpkg/installer/install-menu-perltk.pl:1180
+#: tlpkg/installer/install-menu-perltk.pl:1199
+#: tlpkg/installer/install-menu-perltk.pl:1200
+#: tlpkg/installer/install-menu-perltk.pl:1202
+#: tlpkg/installer/install-menu-perltk.pl:1218
 #: texmf/scripts/texlive/tlmgrgui.pl:655
 #: texmf/scripts/texlive/tlmgrgui.pl:1051
 #: texmf/scripts/texlive/tlmgrgui.pl:1437
 msgid "No"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-wizard.pl:454
+#: tlpkg/installer/install-menu-wizard.pl:670
 #: texmf/scripts/texlive/tlmgrgui.pl:419
 #, fuzzy
 msgid "Install"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-wizard.pl:508
-#: tlpkg/installer/install-menu-perltk.pl:422
+#: tlpkg/installer/install-menu-wizard.pl:724
+#: tlpkg/installer/install-menu-perltk.pl:552
 #, perl-format
 msgid ""
 "See %s/index.html for links to documentation.\n"
@@ -280,8 +328,8 @@ msgstr ""
 "請考慮加入合適的TeX用戶組來支持該項目。從\n"
 "http://tug.org/usergroups.html 可以獲得TeX用戶組的列表。"
 
-#: tlpkg/installer/install-menu-wizard.pl:510
-#: tlpkg/installer/install-menu-perltk.pl:424
+#: tlpkg/installer/install-menu-wizard.pl:726
+#: tlpkg/installer/install-menu-perltk.pl:554
 #, perl-format
 msgid ""
 "Add %s/texmf/doc/man to MANPATH.\n"
@@ -294,96 +342,128 @@ msgstr ""
 "最為重要的是，請添加 %s/bin/%s\n"
 "到你的 PATH 變數。"
 
-#: tlpkg/installer/install-menu-wizard.pl:513
-#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-wizard.pl:729
+#: tlpkg/installer/install-menu-perltk.pl:557
 msgid ""
 "There were some warnings during the installation process.\n"
 "Here is the list of warning messages:"
 msgstr ""
 
-#: tlpkg/installer/install-menu-wizard.pl:517
-#: tlpkg/installer/install-menu-perltk.pl:432
+#: tlpkg/installer/install-menu-wizard.pl:733
+#: tlpkg/installer/install-menu-perltk.pl:562
 msgid "Welcome to TeX Live!"
 msgstr "歡迎進入 TeX Live 的世界！"
 
-#: tlpkg/installer/install-menu-wizard.pl:526
-#: tlpkg/installer/install-menu-perltk.pl:442
+#: tlpkg/installer/install-menu-wizard.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:572
 msgid "Finish"
 msgstr "完成"
 
-#: tlpkg/installer/install-menu-perltk.pl:54
-#: tlpkg/installer/install-menu-perltk.pl:1071
+#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:1201
 #: texmf/scripts/texlive/tlmgrgui.pl:129
 #, fuzzy
 msgid "None"
 msgstr "否"
 
-#: tlpkg/installer/install-menu-perltk.pl:55
+#: tlpkg/installer/install-menu-perltk.pl:56
 #: texmf/scripts/texlive/tlmgrgui.pl:130
 msgid "Only new"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:56
+#: tlpkg/installer/install-menu-perltk.pl:57
 #: texmf/scripts/texlive/tlmgrgui.pl:131
 msgid "All"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:58
+#: tlpkg/installer/install-menu-perltk.pl:59
 msgid "A4"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:59
+#: tlpkg/installer/install-menu-perltk.pl:60
 #: texmf/scripts/texlive/tlmgrgui.pl:1277
 msgid "letter"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:182
+#: tlpkg/installer/install-menu-perltk.pl:265
+msgid "Select repository"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:281
+msgid "Load"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:287
+#: tlpkg/installer/install-menu-perltk.pl:999
+#: tlpkg/installer/install-menu-perltk.pl:1209
+#: texmf/scripts/texlive/tlmgrgui.pl:217
+#: texmf/scripts/texlive/tlmgrgui.pl:1005
+#: texmf/scripts/texlive/tlmgrgui.pl:1573
+#: texmf/scripts/texlive/tlmgrgui.pl:1645
+#: texmf/scripts/texlive/tlmgrgui.pl:1676
+#: texmf/scripts/texlive/tlmgrgui.pl:1967
+#: texmf/scripts/texlive/tlmgrgui.pl:2027
+#: texmf/scripts/texlive/tlmgrgui.pl:2249
+msgid "Warning"
+msgstr ""
+
+#: tlpkg/installer/install-menu-perltk.pl:288
+#, perl-format
+msgid ""
+"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 ""
+
+#: tlpkg/installer/install-menu-perltk.pl:307
 msgid "Basic Information"
 msgstr "基本資訊"
 
-#: tlpkg/installer/install-menu-perltk.pl:187
-#: tlpkg/installer/install-menu-perltk.pl:834
+#: tlpkg/installer/install-menu-perltk.pl:312
+#: tlpkg/installer/install-menu-perltk.pl:964
 msgid "Binary system(s)"
 msgstr "二進位系統"
 
-#: tlpkg/installer/install-menu-perltk.pl:196
-#: tlpkg/installer/install-menu-perltk.pl:576
-#: tlpkg/installer/install-menu-perltk.pl:590
+#: tlpkg/installer/install-menu-perltk.pl:321
+#: tlpkg/installer/install-menu-perltk.pl:706
+#: tlpkg/installer/install-menu-perltk.pl:720
 msgid "Selected scheme"
 msgstr "選擇安裝方案"
 
-#: tlpkg/installer/install-menu-perltk.pl:204
+#: tlpkg/installer/install-menu-perltk.pl:329
 msgid "Further Customization"
 msgstr "進一步定制"
 
-#: tlpkg/installer/install-menu-perltk.pl:208
-#: tlpkg/installer/install-menu-perltk.pl:631
+#: tlpkg/installer/install-menu-perltk.pl:333
+#: tlpkg/installer/install-menu-perltk.pl:761
 msgid "Standard collections"
 msgstr "標準安裝"
 
-#: tlpkg/installer/install-menu-perltk.pl:213
-#: tlpkg/installer/install-menu-perltk.pl:684
+#: tlpkg/installer/install-menu-perltk.pl:338
+#: tlpkg/installer/install-menu-perltk.pl:814
 msgid "Language collections"
 msgstr "語言集合"
 
-#: tlpkg/installer/install-menu-perltk.pl:224
+#: tlpkg/installer/install-menu-perltk.pl:349
 msgid "Directory setup"
 msgstr "目錄設置"
 
-#: tlpkg/installer/install-menu-perltk.pl:227
+#: tlpkg/installer/install-menu-perltk.pl:352
 msgid "Portable setup"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:229
-#: tlpkg/installer/install-menu-perltk.pl:286
-#: tlpkg/installer/install-menu-perltk.pl:291
-#: tlpkg/installer/install-menu-perltk.pl:296
-#: tlpkg/installer/install-menu-perltk.pl:302
-#: tlpkg/installer/install-menu-perltk.pl:309
-#: tlpkg/installer/install-menu-perltk.pl:320
-#: tlpkg/installer/install-menu-perltk.pl:328
-#: tlpkg/installer/install-menu-perltk.pl:341
-#: tlpkg/installer/install-menu-perltk.pl:349
+#: tlpkg/installer/install-menu-perltk.pl:354
+#: tlpkg/installer/install-menu-perltk.pl:411
+#: tlpkg/installer/install-menu-perltk.pl:416
+#: tlpkg/installer/install-menu-perltk.pl:421
+#: tlpkg/installer/install-menu-perltk.pl:427
+#: tlpkg/installer/install-menu-perltk.pl:434
+#: tlpkg/installer/install-menu-perltk.pl:445
+#: tlpkg/installer/install-menu-perltk.pl:453
+#: tlpkg/installer/install-menu-perltk.pl:466
+#: tlpkg/installer/install-menu-perltk.pl:474
 #: texmf/scripts/texlive/tlmgrgui.pl:1091
 #: texmf/scripts/texlive/tlmgrgui.pl:1099
 #: texmf/scripts/texlive/tlmgrgui.pl:1107
@@ -392,176 +472,163 @@ msgstr ""
 msgid "Toggle"
 msgstr "切換"
 
-#: tlpkg/installer/install-menu-perltk.pl:233
+#: tlpkg/installer/install-menu-perltk.pl:358
 msgid "TEXDIR (the main TeX directory)"
 msgstr "TEXDIR (主 TeX 目錄)"
 
-#: tlpkg/installer/install-menu-perltk.pl:246
+#: tlpkg/installer/install-menu-perltk.pl:371
 msgid "TEXMFLOCAL (directory for site-wide local files)"
 msgstr "TEXMFLOCAL (存放本地格式檔等)"
 
-#: tlpkg/installer/install-menu-perltk.pl:253
+#: tlpkg/installer/install-menu-perltk.pl:378
 msgid "TEXMFSYSVAR (directory for autogenerated data)"
 msgstr "TEXMFSYSVAR (存放本地配置)"
 
-#: tlpkg/installer/install-menu-perltk.pl:260
+#: tlpkg/installer/install-menu-perltk.pl:385
 msgid "TEXMFSYSCONFIG (directory for local config)"
 msgstr "TEXMFSYSCONFIG (存放本地配置)"
 
-#: tlpkg/installer/install-menu-perltk.pl:267
+#: tlpkg/installer/install-menu-perltk.pl:392
 #, fuzzy
 msgid "TEXMFHOME (directory for user-specific files)"
 msgstr "TEXMFLOCAL (存放本地格式檔等)"
 
-#: tlpkg/installer/install-menu-perltk.pl:280
+#: tlpkg/installer/install-menu-perltk.pl:405
 #: texmf/scripts/texlive/tlmgrgui.pl:476
 msgid "Options"
 msgstr "選項"
 
-#: tlpkg/installer/install-menu-perltk.pl:289
+#: tlpkg/installer/install-menu-perltk.pl:414
 msgid "Allow execution of restricted list of programs via \\write18"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:294
+#: tlpkg/installer/install-menu-perltk.pl:419
 msgid "Create all format files"
 msgstr "創建所有格式檔"
 
-#: tlpkg/installer/install-menu-perltk.pl:300
+#: tlpkg/installer/install-menu-perltk.pl:425
 msgid "Install font/macro doc tree"
 msgstr "安裝字體/巨集包文檔目錄樹"
 
-#: tlpkg/installer/install-menu-perltk.pl:307
+#: tlpkg/installer/install-menu-perltk.pl:432
 msgid "Install font/macro source tree"
 msgstr "安裝字體/巨集包源碼目錄樹"
 
-#: tlpkg/installer/install-menu-perltk.pl:314
-#: tlpkg/installer/install-menu-perltk.pl:800
+#: tlpkg/installer/install-menu-perltk.pl:439
+#: tlpkg/installer/install-menu-perltk.pl:930
 msgid "Create symlinks in system directories"
 msgstr "創建指向系統目錄的符號鏈結"
 
-#: tlpkg/installer/install-menu-perltk.pl:346
+#: tlpkg/installer/install-menu-perltk.pl:471
 #, fuzzy
 msgid "Install TeXworks front end"
 msgstr "安裝字體/巨集包文檔目錄樹"
 
-#: tlpkg/installer/install-menu-perltk.pl:361
+#: tlpkg/installer/install-menu-perltk.pl:487
 #, fuzzy
 msgid "Install TeX Live"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:365
+#: tlpkg/installer/install-menu-perltk.pl:491
 #: texmf/scripts/texlive/tlmgrgui.pl:501
 msgid "Quit"
 msgstr "退出"
 
-#: tlpkg/installer/install-menu-perltk.pl:401
-#: tlpkg/installer/install-menu-perltk.pl:405
+#: tlpkg/installer/install-menu-perltk.pl:531
+#: tlpkg/installer/install-menu-perltk.pl:535
 #, fuzzy
 msgid "Installation process"
 msgstr "安裝 TeX Live"
 
-#: tlpkg/installer/install-menu-perltk.pl:483
-#: tlpkg/installer/install-menu-perltk.pl:514
+#: tlpkg/installer/install-menu-perltk.pl:613
+#: tlpkg/installer/install-menu-perltk.pl:644
 msgid "Change variable value"
 msgstr "更改變數的值"
 
-#: tlpkg/installer/install-menu-perltk.pl:486
-#: tlpkg/installer/install-menu-perltk.pl:524
+#: tlpkg/installer/install-menu-perltk.pl:616
+#: tlpkg/installer/install-menu-perltk.pl:654
 #, perl-format
 msgid "Enter path for %s (use ~ for %s)"
 msgstr "輸入路徑變數 %s (使用 ~ 作為 %s)"
 
-#: tlpkg/installer/install-menu-perltk.pl:602
+#: tlpkg/installer/install-menu-perltk.pl:732
 msgid "custom selection of collections"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:640
+#: tlpkg/installer/install-menu-perltk.pl:770
 msgid "Select the collections to be installed"
 msgstr "選擇要安裝的組件"
 
-#: tlpkg/installer/install-menu-perltk.pl:656
-#: tlpkg/installer/install-menu-perltk.pl:718
-#: tlpkg/installer/install-menu-perltk.pl:740
+#: tlpkg/installer/install-menu-perltk.pl:786
+#: tlpkg/installer/install-menu-perltk.pl:848
+#: tlpkg/installer/install-menu-perltk.pl:870
 msgid "Select All"
 msgstr "全部選擇"
 
-#: tlpkg/installer/install-menu-perltk.pl:658
-#: tlpkg/installer/install-menu-perltk.pl:720
-#: tlpkg/installer/install-menu-perltk.pl:742
+#: tlpkg/installer/install-menu-perltk.pl:788
+#: tlpkg/installer/install-menu-perltk.pl:850
+#: tlpkg/installer/install-menu-perltk.pl:872
 msgid "Deselect All"
 msgstr "取消全部選擇"
 
-#: tlpkg/installer/install-menu-perltk.pl:689
+#: tlpkg/installer/install-menu-perltk.pl:819
 msgid "Select language support"
 msgstr "選擇語言支援"
 
-#: tlpkg/installer/install-menu-perltk.pl:690
+#: tlpkg/installer/install-menu-perltk.pl:820
 msgid "Select language-specific documentation"
 msgstr "選擇相關語言的文檔"
 
-#: tlpkg/installer/install-menu-perltk.pl:804
+#: tlpkg/installer/install-menu-perltk.pl:934
 msgid "create symlinks in standard directories"
 msgstr "在標準位置創建符號鏈結"
 
-#: tlpkg/installer/install-menu-perltk.pl:809
+#: tlpkg/installer/install-menu-perltk.pl:939
 msgid "binaries to"
 msgstr "程式檔安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:811
+#: tlpkg/installer/install-menu-perltk.pl:941
 msgid "manpages to"
 msgstr "手冊文檔(*.man)安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:813
+#: tlpkg/installer/install-menu-perltk.pl:943
 msgid "info to"
 msgstr "超文本文檔(*.info)安裝位置"
 
-#: tlpkg/installer/install-menu-perltk.pl:843
+#: tlpkg/installer/install-menu-perltk.pl:973
 msgid "Select arch-os"
 msgstr "選擇系統架構"
 
-#: tlpkg/installer/install-menu-perltk.pl:869
-#: tlpkg/installer/install-menu-perltk.pl:1079
-#: texmf/scripts/texlive/tlmgrgui.pl:217
-#: texmf/scripts/texlive/tlmgrgui.pl:1005
-#: texmf/scripts/texlive/tlmgrgui.pl:1573
-#: texmf/scripts/texlive/tlmgrgui.pl:1645
-#: texmf/scripts/texlive/tlmgrgui.pl:1676
-#: texmf/scripts/texlive/tlmgrgui.pl:1967
-#: texmf/scripts/texlive/tlmgrgui.pl:2027
-#: texmf/scripts/texlive/tlmgrgui.pl:2249
-msgid "Warning"
-msgstr ""
-
-#: tlpkg/installer/install-menu-perltk.pl:870
+#: tlpkg/installer/install-menu-perltk.pl:1000
 #: texmf/scripts/texlive/tlmgrgui.pl:1006
 msgid "Removals of the main platform not possible!"
 msgstr ""
 
-#: tlpkg/installer/install-menu-perltk.pl:902
+#: tlpkg/installer/install-menu-perltk.pl:1032
 #, perl-format
 msgid "%s out of %s"
 msgstr "%s 來自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:908
+#: tlpkg/installer/install-menu-perltk.pl:1038
 #, fuzzy, perl-format
 msgid "%s collections out of %s"
 msgstr "%s 集合來自 %s"
 
-#: tlpkg/installer/install-menu-perltk.pl:919
+#: tlpkg/installer/install-menu-perltk.pl:1049
 msgid "(no language collection selected!)"
 msgstr "(沒有選擇語言集合！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:933
-#: tlpkg/installer/install-menu-perltk.pl:944
+#: tlpkg/installer/install-menu-perltk.pl:1063
+#: tlpkg/installer/install-menu-perltk.pl:1074
 msgid "(please change TEXDIR first!)"
 msgstr "(請首先改變 TEXDIR ！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:936
-#: tlpkg/installer/install-menu-perltk.pl:947
+#: tlpkg/installer/install-menu-perltk.pl:1066
+#: tlpkg/installer/install-menu-perltk.pl:1077
 msgid "(default not writable - please change!)"
 msgstr "(默認位置不可寫 - 請做相應更改！)"
 
-#: tlpkg/installer/install-menu-perltk.pl:1080
+#: tlpkg/installer/install-menu-perltk.pl:1210
 msgid ""
 "Portable option changed;\n"
 "Directories have been reinitialized"