2 files changed, 120 insertions, 98 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 92cc0aca1..2f56cf470 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-01-02 00:33+0100\n"
+"POT-Creation-Date: 2000-01-02 00:58+0100\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"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 7f56e4fcc..63787129a 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-01-01 19:31+0100\n"
+"POT-Creation-Date: 2000-01-02 00:58+0100\n"
 "PO-Revision-Date: 1999-08-09 16:39+0200\n"
 "Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
 "Language-Team: Serbian (cyrillic)\n"
@@ -798,8 +798,9 @@ msgstr "ßàÞÜÕÝÐ ÒÕÛØçØÝÕ"
 msgid "Choose the new size"
 msgstr "¸×ÐÑÕàØâÕ ÝÞÒã ÒÕÛØçØÝã"
 
-#: ../diskdrake.pm_.c:534 ../install_steps_gtk.pm_.c:329
-#: ../install_steps_gtk.pm_.c:378 ../unused/install_steps_graphical.pm_.c:314
+#: ../diskdrake.pm_.c:534 ../install_steps_graphical.pm_.c:287
+#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:329
+#: ../install_steps_gtk.pm_.c:378
 msgid "MB"
 msgstr "MB"
 
@@ -1852,35 +1853,12 @@ msgstr "½ÕßàØáâãßÐçÐÝ floppy ãàÕòÐø"
 msgid "Entering step `%s'\n"
 msgstr "¿ÞÚàÕûÕÜ ÚÞàÐÚ `%s'\n"
 
-#: ../install_steps_gtk.pm_.c:259
-msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first run scandisk "
-"(and\n"
-"optionally run defrag) on this partition and backup your data.\n"
-"When sure, press Ok."
-msgstr ""
-"¿°¶ª°, ¿°¶ª° !\n"
-"\n"
-"DrakX âàÕÑÐ ÔÐ Ø×ÜÕÝØ ÒÕÛØçØÝã Windows ßÐàâØæØøÕ. ±ãÔØâÕ ßÐÖùØÒØ: ÞÒÐ\n"
-"ÞßÕàÐæØï øÕ ÞßÐáÝÐ. ÃÚÞÛØÚÞ âÞ ÔÞáÐÔÐ ÝØáâÕ àÐÔØÛØ, ßàÒÞ âàÕÑÐ ÔÐ ßÞÚàÕÝÕâÕ\n"
-"scandisk (ÕÒÕÝâãÐÛÝÞ Ø defrag) ÝÐ ÞÒÞø ßÐàâØæØøØ Ø ÝÐßàÐÒØâÕ backup "
-"ßÞÔÐâÐÚÐ.\n"
-"°ÚÞ áâÕ áØÓãàÝØ, ßàØâØáÝØâÕ \"à àÕÔã\"."
-
-#: ../install_steps_gtk.pm_.c:277
-msgid "Automatic resizing failed"
-msgstr "°ãâÞÜÐâáÚÐ Ø×ÜÕÝÐ ÒÕÛØçØÝÕ ÝÕãáßÕÛÐ"
-
-#: ../install_steps_gtk.pm_.c:293 ../unused/install_steps_graphical.pm_.c:255
+#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:293
 #, fuzzy
 msgid "You must have a swap partition"
 msgstr "¼ÞàÐâÕ ØÜÐâØ swap ßÐàâØæØøã ÔÐ ÑØáâÕ ÝÐáâÐÒØÛØ áÐ ØÝáâÐÛÐæØøÞÜ."
 
-#: ../install_steps_gtk.pm_.c:295 ../unused/install_steps_graphical.pm_.c:258
+#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:295
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -1890,99 +1868,126 @@ msgstr ""
 "\n"
 "ÁÒÕøÕÔÝÞ ÝÐáâÐÒØâØ ÔÐùÕ ?"
 
-#: ../install_steps_gtk.pm_.c:326
-#, c-format
-msgid "Going to install %d MB. You can choose to install more programs"
-msgstr "¸ÝáâÐÛØàÐûã %d MB. ¼ÞÖÕâÕ Ø×ÐÑàÐâØ ÔÐ ØÝáâÐÛØàÐâÕ øÞè ßàÞÓàÐÜÐ"
-
-#: ../install_steps_gtk.pm_.c:327
-msgid "You will be able to choose more precisely in next step"
-msgstr "¼ÞûØ ûÕâÕ ÔÐ ßàÕæØ×ÝØøÕ ÑØàÐâÕ ã áÛÕÔÕæÕÜ ÚÞàÐÚã"
-
-#: ../install_steps_gtk.pm_.c:329
+#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:329
 msgid "Choose the size you want to install"
 msgstr "¸×ÐÑÕàØâÕ ÒÕÛØçØÝã ÚÞÜßÞÝÕÝâØ ×Ð ØÝáâÐÛÐæØøã"
 
-#: ../install_steps_gtk.pm_.c:378 ../unused/install_steps_graphical.pm_.c:314
+#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:378
 msgid "Total size: "
 msgstr "ÃÚãßÝÐ ÒÕÛØçØÝÐ: "
 
-#: ../install_steps_gtk.pm_.c:389
-#, fuzzy
-msgid "Bad package"
-msgstr "%d ßÐÚÕâÐ"
-
-#: ../install_steps_gtk.pm_.c:390 ../unused/install_steps_graphical.pm_.c:284
+#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:390
 #, c-format
 msgid "Version: %s\n"
 msgstr "²Õà×Øï: %s\n"
 
-#: ../install_steps_gtk.pm_.c:391 ../unused/install_steps_graphical.pm_.c:285
+#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:391
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "²ÕÛØçØÝÐ: %d KB\n"
 
-#: ../install_steps_gtk.pm_.c:506 ../unused/install_steps_graphical.pm_.c:421
+#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:506
 msgid "Choose the packages you want to install"
 msgstr "¸×ÐÑÕàØ ßÐÚÕâÕ ×Ð ØÝáâÐÛÐæØøã"
 
-#: ../install_steps_gtk.pm_.c:509 ../unused/install_steps_graphical.pm_.c:424
+#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:509
 msgid "Info"
 msgstr "¸ÝäÞ"
 
-#: ../install_steps_gtk.pm_.c:517 ../install_steps_interactive.pm_.c:81
-#: ../unused/install_steps_graphical.pm_.c:432
+#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:517
+#: ../install_steps_interactive.pm_.c:81
 msgid "Install"
 msgstr "¸ÝáâÐÛØàÐø"
 
-#: ../install_steps_gtk.pm_.c:536 ../install_steps_interactive.pm_.c:257
-#: ../unused/install_steps_graphical.pm_.c:451
+#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:536
+#: ../install_steps_interactive.pm_.c:257
 msgid "Installing"
 msgstr "¸ÝáâÐÛØàÐÜ"
 
-#: ../install_steps_gtk.pm_.c:539
-msgid "Estimating"
-msgstr "¿àÞæÕúãøÕÜ"
-
-#: ../install_steps_gtk.pm_.c:543 ../unused/install_steps_graphical.pm_.c:457
+#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:543
 msgid "Please wait, "
 msgstr "¼ÞÛØÜ áÐçÕÚÐøâÕ"
 
-#: ../install_steps_gtk.pm_.c:545 ../unused/install_steps_graphical.pm_.c:459
+#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:545
 msgid "Time remaining "
 msgstr "¿àÕÞáâÐÛÞ ÒàÕÜÕ"
 
-#: ../install_steps_gtk.pm_.c:546 ../unused/install_steps_graphical.pm_.c:460
+#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:546
 msgid "Total time "
 msgstr "ÃÚãßÝÞ ÒàÕÜÕ"
 
-#: ../install_steps_gtk.pm_.c:551 ../install_steps_interactive.pm_.c:257
-#: ../unused/install_steps_graphical.pm_.c:465
+#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:551
+#: ../install_steps_interactive.pm_.c:257
 msgid "Preparing installation"
 msgstr "¿àØßàÕÜÐÜ ØÝáâÐÛÐæØøã"
 
-#: ../install_steps_gtk.pm_.c:561
-#, c-format
-msgid "%d packages"
-msgstr "%d ßÐÚÕâÐ"
-
-#: ../install_steps_gtk.pm_.c:561
-msgid ", %U MB"
-msgstr ", %U MB"
-
-#: ../install_steps_gtk.pm_.c:566 ../unused/install_steps_graphical.pm_.c:486
+#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:566
 #, c-format
 msgid "Installing package %s"
 msgstr "¸ÝáâÐÛØàÐÜ ßÐÚÕâ %s"
 
-#: ../install_steps_gtk.pm_.c:591 ../unused/install_steps_graphical.pm_.c:511
+#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:591
 msgid "Go on anyway?"
 msgstr "ÁÒÕøÕÔÝÞ ÝÐáâÐÒØâØ ÔÐùÕ ?"
 
-#: ../install_steps_gtk.pm_.c:591 ../unused/install_steps_graphical.pm_.c:511
+#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:591
 msgid "There was an error ordering packages:"
 msgstr "³àÕèÚÐ ã ÛØáâØ ßÐÚÕâÐ:"
 
+#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:832
+msgid "Use existing configuration for X11?"
+msgstr "´Ð ÚÞàØáâØÜ ßÞáâÞøÕûã ÚÞÝäØÓãàÐæØøã ×Ð X11 ?"
+
+#: ../install_steps_gtk.pm_.c:259
+msgid ""
+"WARNING!\n"
+"\n"
+"DrakX now needs to resize your Windows partition. Be careful: this operation "
+"is\n"
+"dangerous. If you have not already done so, you should first run scandisk "
+"(and\n"
+"optionally run defrag) on this partition and backup your data.\n"
+"When sure, press Ok."
+msgstr ""
+"¿°¶ª°, ¿°¶ª° !\n"
+"\n"
+"DrakX âàÕÑÐ ÔÐ Ø×ÜÕÝØ ÒÕÛØçØÝã Windows ßÐàâØæØøÕ. ±ãÔØâÕ ßÐÖùØÒØ: ÞÒÐ\n"
+"ÞßÕàÐæØï øÕ ÞßÐáÝÐ. ÃÚÞÛØÚÞ âÞ ÔÞáÐÔÐ ÝØáâÕ àÐÔØÛØ, ßàÒÞ âàÕÑÐ ÔÐ ßÞÚàÕÝÕâÕ\n"
+"scandisk (ÕÒÕÝâãÐÛÝÞ Ø defrag) ÝÐ ÞÒÞø ßÐàâØæØøØ Ø ÝÐßàÐÒØâÕ backup "
+"ßÞÔÐâÐÚÐ.\n"
+"°ÚÞ áâÕ áØÓãàÝØ, ßàØâØáÝØâÕ \"à àÕÔã\"."
+
+#: ../install_steps_gtk.pm_.c:277
+msgid "Automatic resizing failed"
+msgstr "°ãâÞÜÐâáÚÐ Ø×ÜÕÝÐ ÒÕÛØçØÝÕ ÝÕãáßÕÛÐ"
+
+#: ../install_steps_gtk.pm_.c:326
+#, c-format
+msgid "Going to install %d MB. You can ch