update-po

2 files changed, 144 insertions, 157 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index ff43930f9..69bcddf74 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: 1999-12-21 20:37+0100\n"
+"POT-Creation-Date: 1999-12-21 23:44+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"
@@ -756,8 +756,9 @@ msgstr ""
 msgid "Choose the new size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:534 ../install_steps_gtk.pm_.c:328
-#: ../install_steps_gtk.pm_.c:377 ../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:328
+#: ../install_steps_gtk.pm_.c:377
 msgid "MB"
 msgstr ""
 
@@ -1490,119 +1491,123 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:258
-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 ""
-
-#: ../install_steps_gtk.pm_.c:276
-msgid "Automatic resizing failed"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:292 ../unused/install_steps_graphical.pm_.c:255
+#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:292
 msgid "You must have a swap partition"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:294 ../unused/install_steps_graphical.pm_.c:258
+#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:294
 msgid ""
 "You don't have a swap partition\n"
 "\n"
 "Continue anyway?"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:325
-#, c-format
-msgid "Going to install %d MB. You can choose to install more programs"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:326
-msgid "You will be able to choose more precisely in next step"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:328
+#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:328
 msgid "Choose the size you want to install"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:377 ../unused/install_steps_graphical.pm_.c:314
+#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:377
 msgid "Total size: "
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:389 ../unused/install_steps_graphical.pm_.c:284
+#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Version: %s\n"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:390 ../unused/install_steps_graphical.pm_.c:285
+#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:390
 #, c-format
 msgid "Size: %d KB\n"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:505 ../unused/install_steps_graphical.pm_.c:421
+#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:505
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:508 ../unused/install_steps_graphical.pm_.c:424
+#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:508
 msgid "Info"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:516 ../install_steps_interactive.pm_.c:80
-#: ../unused/install_steps_graphical.pm_.c:432
+#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:516
+#: ../install_steps_interactive.pm_.c:80
 msgid "Install"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:535 ../install_steps_interactive.pm_.c:252
-#: ../unused/install_steps_graphical.pm_.c:451
+#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:535
+#: ../install_steps_interactive.pm_.c:252
 msgid "Installing"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:538
-msgid "Estimating"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:542 ../unused/install_steps_graphical.pm_.c:457
+#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:542
 msgid "Please wait, "
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:544 ../unused/install_steps_graphical.pm_.c:459
+#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:544
 msgid "Time remaining "
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:545 ../unused/install_steps_graphical.pm_.c:460
+#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:545
 msgid "Total time "
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:550 ../install_steps_interactive.pm_.c:252
-#: ../unused/install_steps_graphical.pm_.c:465
+#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:550
+#: ../install_steps_interactive.pm_.c:252
 msgid "Preparing installation"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:560
+#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:565
 #, c-format
-msgid "%d packages"
+msgid "Installing package %s"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:560
-msgid ", %U MB"
+#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:590
+msgid "Go on anyway?"
+msgstr ""
+
+#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:590
+msgid "There was an error ordering packages:"
+msgstr ""
+
+#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:796
+msgid "Use existing configuration for X11?"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:565 ../unused/install_steps_graphical.pm_.c:486
+#: ../install_steps_gtk.pm_.c:258
+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 ""
+
+#: ../install_steps_gtk.pm_.c:276
+msgid "Automatic resizing failed"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:325
 #, c-format
-msgid "Installing package %s"
+msgid "Going to install %d MB. You can choose to install more programs"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:590 ../unused/install_steps_graphical.pm_.c:511
-msgid "Go on anyway?"
+#: ../install_steps_gtk.pm_.c:326
+msgid "You will be able to choose more precisely in next step"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:590 ../unused/install_steps_graphical.pm_.c:511
-msgid "There was an error ordering packages:"
+#: ../install_steps_gtk.pm_.c:538
+msgid "Estimating"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:560
+#, c-format
+msgid "%d packages"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:560
+msgid ", %U MB"
 msgstr ""
 
 #: ../install_steps_interactive.pm_.c:36
@@ -1943,7 +1948,7 @@ msgstr ""
 #: ../interactive.pm_.c:84 ../interactive.pm_.c:163
 #: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:94
 #: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:423
-#: ../my_gtk.pm_.c:523 ../unused/install_steps_graphical.pm_.c:608
+#: ../my_gtk.pm_.c:523
 msgid "Ok"
 msgstr ""
 
@@ -2308,11 +2313,6 @@ msgstr ""
 msgid "Give the ram size in Mb"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:796
-#: ../unused/install_steps_graphical.pm_.c:535
-msgid "Use existing configuration for X11?"
-msgstr ""
-
 #: ../install_steps_interactive.pm_.c:808
 #: ../install_steps_interactive.pm_.c:921
 msgid "Try to find PCI devices?"
@@ -3075,11 +3075,3 @@ msgstr ""
 #: ../standalone/mousedrake_.c:35
 msgid "Emulate third button?"
 msgstr ""
-
-#: ../unused/install_steps_graphical.pm_.c:433
-msgid "Show less"
-msgstr ""
-
-#: ../unused/install_steps_graphical.pm_.c:434
-msgid "Show more"
-msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 42a8a1068..8708474e9 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 1999-12-21 20:37+0100\n"
+"POT-Creation-Date: 1999-12-21 23:44+0100\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -795,8 +795,9 @@ msgstr "endrer størrelse"
 msgid "Choose the new size"
 msgstr "Velg den nye størrelsen"
 
-#: ../diskdrake.pm_.c:534 ../install_steps_gtk.pm_.c:328
-#: ../install_steps_gtk.pm_.c:377 ../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:328
+#: ../install_steps_gtk.pm_.c:377
 msgid "MB"
 msgstr "MB"
 
@@ -1774,37 +1775,11 @@ msgstr "Ingen diskettstasjon tilgjengelig"
 msgid "Entering step `%s'\n"
 msgstr "Entrer trinn `%s'\n"
 
-#: ../install_steps_gtk.pm_.c:258
-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 ""
-"ADVARSEL!\n"
-"\n"
-"DrakX trenger nå å endre størrelsen på Windows partisjonen din. Vær "
-"forsiktig: denne operasjonen er\n"
-"farlig. Hvis du ikke allerede har gjort det burde du kjøre scandisk først "
-"(og\n"
-"som en opsjon kjøre defrag) på denne partisjonen og ta sikkerhetskopi av "
-"dine\n"
-"data.\n"
-"Når du er sikker, trykk Ok."
-
-#: ../install_steps_gtk.pm_.c:276
-msgid "Automatic resizing failed"
-msgstr "Automatisk endring av størrelse mislykket"
-
-#: ../install_steps_gtk.pm_.c:292 ../unused/install_steps_graphical.pm_.c:255
+#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:292
 msgid "You must have a swap partition"
 msgstr "Du må ha en vekslingspartisjon"
 
-#: ../install_steps_gtk.pm_.c:294 ../unused/install_steps_graphical.pm_.c:258
+#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:294
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -1814,94 +1789,124 @@ msgstr ""
 "\n"
 "Fortsette likevel?"
 
-#: ../install_steps_gtk.pm_.c:325
-#, c-format
-msgid "Going to install %d MB. You can choose to install more programs"
-msgstr "%d MB vil bli installert. Du kan velge å installere flere programmer"
-
-#: ../install_steps_gtk.pm_.c:326
-msgid "You will be able to choose more precisely in next step"
-msgstr "Du vil kunne velge mere presist i neste trinn"
-
-#: ../install_steps_gtk.pm_.c:328
+#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:328
 msgid "Choose the size you want to install"
 msgstr "Velg størrelsen du ønsker å installere"
 
-#: ../install_steps_gtk.pm_.c:377 ../unused/install_steps_graphical.pm_.c:314
+#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:377
 msgid "Total size: "
 msgstr "Total størrelse: "
 
-#: ../install_steps_gtk.pm_.c:389 ../unused/install_steps_graphical.pm_.c:284
+#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versjon: %s\n"
 
-#: ../install_steps_gtk.pm_.c:390 ../unused/install_steps_graphical.pm_.c:285
+#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:390
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Størrelse: %d KB\n"
 
-#: ../install_steps_gtk.pm_.c:505 ../unused/install_steps_graphical.pm_.c:421
+#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:505
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du ønsker å installere"
 
-#: ../install_steps_gtk.pm_.c:508 ../unused/install_steps_graphical.pm_.c:424
+#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:508
 msgid "Info"
 msgstr "Info"
 
-#: ../install_steps_gtk.pm_.c:516 ../install_steps_interactive.pm_.c:80
-#: ../unused/install_steps_graphical.pm_.c:432
+#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:516
+#: ../install_steps_interactive.pm_.c:80
 msgid "Install"
 msgstr "Installer"
 
-#: ../install_steps_gtk.pm_.c:535 ../install_steps_interactive.pm_.c:252
-#: ../unused/install_steps_graphical.pm_.c:451
+#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:535
+#: ../install_steps_interactive.pm_.c:252
 msgid "Installing"
 msgstr "Installerer"
 
-#: ../install_steps_gtk.pm_.c:538
-msgid "Estimating"
-msgstr "Beregner"
-
-#: ../install_steps_gtk.pm_.c:542 ../unused/install_steps_graphical.pm_.c:457
+#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:542
 msgid "Please wait, "
 msgstr "Vennligst vent, "
 
-#: ../install_steps_gtk.pm_.c:544 ../unused/install_steps_graphical.pm_.c:459
+#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:544
 msgid "Time remaining "
 msgstr "Tid som gjenstår "
 
-#: ../install_steps_gtk.pm_.c:545 ../unused/install_steps_graphical.pm_.c:460
+#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:545
 msgid "Total time "
 msgstr "Total tid "
 
-#: ../install_steps_gtk.pm_.c:550 ../install_steps_interactive.pm_.c:252
-#: ../unused/install_steps_graphical.pm_.c:465
+#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:550
+#: ../install_steps_interactive.pm_.c:252
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: ../install_steps_gtk.pm_.c:560
-#, c-format
-msgid "%d packages"
-msgstr "%d pakker"
-
-#: ../install_steps_gtk.pm_.c:560
-msgid ", %U MB"
-msgstr ", %U MB"
-
-#: ../install_steps_gtk.pm_.c:565 ../unused/install_steps_graphical.pm_.c:486
+#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:565
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: ../install_steps_gtk.pm_.c:590 ../unused/install_steps_graphical.pm_.c:511
+#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:590
 msgid "Go on anyway?"
 msgstr "Fortsette uansett?"
 
-#: ../install_steps_gtk.pm_.c:590 ../unused/install_steps_graphical.pm_.c:511
+#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:590
 msgid "There was an error ordering packages:"
 msgstr "Det var en feil ved endring av pakkenes rekkefølge:"
 
+#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:796
+msgid "Use existing configuration for X11?"
+msgstr "Bruke eksisterende konfigurasjon for X11?"
+
+#: ../install_steps_gtk.pm_.c:258
+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 ""
+"ADVARSEL!\n"
+"\n"
+"DrakX trenger nå å endre størrelsen på Windows partisjonen din. Vær "
+"forsiktig: denne operasjonen er\n"
+"farlig. Hvis du ikke allerede har gjort det burde du kjøre scandisk først "
+"(og\n"
+"som en opsjon kjøre defrag) på denne partisjonen og ta sikkerhetskopi av "
+"dine\n"
+"data.\n"
+"Når du er sikker, trykk Ok."
+
+#: ../install_steps_gtk.pm_.c:276
+msgid "Automatic resizing failed"
+msgstr "Automatisk endring av størrelse mislykket"
+
+#: ../install_steps_gtk.pm_.c:325
+#, c-format
+msgid "Going to install %d MB. You can choose to install more programs"
+msgstr "%d MB vil bli installert. Du kan velge å installere flere programmer"
+
+#: ../install_steps_gtk.pm_.c:326
+msgid "You will be able to choose more precisely in next step"
+msgstr "Du vil kunne velge mere presist i neste trinn"
+
+#: ../install_steps_gtk.pm_.c:538
+msgid "Estimating"
+msgstr "Beregner"
+
+#: ../install_steps_gtk.pm_.c:560
+#, c-format
+msgid "%d packages"
+msgstr "%d pakker"
+
+#: ../install_steps_gtk.pm_.c:560
+msgid ", %U MB"
+msgstr ", %U MB"
+
 #: ../install_steps_interactive.pm_.c:36
 msgid "An error occurred"
 msgstr "En feil oppsto"
@@ -2251,7 +2256,7 @@ msgstr "Intet passord"
 #: ../interactive.pm_.c:84 ../interactive.pm_.c:163
 #: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:94
 #: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:423
-#: ../my_gtk.pm_.c:523 ../unused/install_steps_graphical.pm_.c:608
+#: ../my_gtk.pm_.c:523
 msgid "Ok"
 msgstr "Ok"
 
@@ -2632,11 +2637,6 @@ msgstr "Slå på num lock ved oppstart"
 msgid "Give the ram size in Mb"
 msgstr "Oppgi ram-størrelsen i Mb"
 
-#: ../install_steps_interactive.pm_.c:796
-#: ../unused/install_steps_graphical.pm_.c:535
-msgid "Use existing configuration for X11?"
-msgstr "Bruke eksisterende konfigurasjon for X11?"
-
 #: ../install_steps_interactive.pm_.c:808
 #: ../install_steps_interactive.pm_.c:921
 msgid "Try to find PCI devices?"
@@ -3460,14 +3460,9 @@ msgstr "ingen serie_usb funnet\n"
 msgid "Emulate third button?"
 msgstr "Emulere tredje knapp?"
 
-#: ../unused/install_steps_graphical.pm_.c:433
 #, fuzzy
-msgid "Show less"
-msgstr "Vis alle"
-
-#: ../unused/install_steps_graphical.pm_.c:434
-msgid "Show more"
-msgstr ""
+#~ msgid "Show less"
+#~ msgstr "Vis alle"
 
 #~ msgid "Rescue partition table"
 #~ msgstr "Redde partisjonstabell"