handle /etc/urpmi/proxy.cfg proxies, have a proxy dialog config in

edit-urpm-sources

1 files changed, 153 insertions, 130 deletions

diff --git a/po/no.po b/po/no.po
index cb76c13f..335018de 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-30 10:17+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
 "PO-Revision-Date: 2002-02-03 14:16CET\n"
 "Last-Translator: Terje Bjerrkelia <terje@bjerkelia.com>\n"
 "Language-Team: Norsk\n"
@@ -57,7 +57,7 @@ msgstr "Sti eller monteringspunkt:"
 msgid "Removable device"
 msgstr "Fjernbare enheter"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
 msgid "Security updates"
 msgstr "Sikkerhetsoppdateringer"
 
@@ -73,7 +73,7 @@ msgstr "Velg et speil..."
 msgid "Login:"
 msgstr "Logg inn:"
 
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
 msgid "Password:"
 msgstr "Passord:"
 
@@ -106,14 +106,16 @@ msgid "Type of source:"
 msgstr "Type kilde:"
 
 #: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
 msgid "Ok"
 msgstr "Ok"
 
 #: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
 #: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -163,43 +165,73 @@ msgstr "Oppdater"
 msgid "Please wait, updating media..."
 msgstr "Vennligst vent, oppdaterer media..."
 
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Konfigurer kilder"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Proxy brukernavn:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Brukernavn:"
+
+#: ../edit-urpm-sources.pl_.c:250
 msgid "Configure sources"
 msgstr "Konfigurer kilder"
 
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
 msgid "Enabled?"
 msgstr "Slått på?"
 
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
 msgid "Source"
 msgstr "Kilde"
 
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
 msgid "Add..."
 msgstr "Legg til..."
 
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
 msgid "Update..."
 msgstr "Oppdater..."
 
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Feil..."
+
+#: ../edit-urpm-sources.pl_.c:289
 msgid "Save and quit"
 msgstr "Lagre og avslutt"
 
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
 #, c-format
 msgid ""
 "%s\n"
@@ -210,7 +242,7 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
 msgid ""
 "Welcome to the packages source editor!\n"
 "\n"
@@ -343,11 +375,11 @@ msgid "China"
 msgstr "Kina"
 
 #: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
 msgid "United States"
 msgstr "USA"
 
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
 msgid ""
 "I need to contact MandrakeSoft website to get the mirrors list.\n"
 "Please check that your network is currently running.\n"
@@ -359,16 +391,16 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
 msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 "Vennligst vent, laster ned adresser over speil fra MandrakeSoft website."
 
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
 msgid "Error during download"
 msgstr "Feil oppsto under nedlasting"
 
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
 #, c-format
 msgid ""
 "There was an error downloading the mirrors list:\n"
@@ -383,11 +415,11 @@ msgstr ""
 "Nettverket, eller MandrakeSoft website, er kanskje ikke tilgjengelig.\n"
 "Vennligst prøv igjen senere."
 
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
 msgid "No mirror"
 msgstr "Ingen speil"
 
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -401,7 +433,7 @@ msgstr ""
 "når arkitekturen til prosessoren din ikke er støttet\n"
 "av Mandrake Linux offisielle oppdateringer."
 
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
 msgid "Please choose the desired mirror."
 msgstr "Vennligst velg ønsket speil."
 
@@ -409,76 +441,76 @@ msgstr "Vennligst velg ønsket speil."
 msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
 msgid "(Non available)"
 msgstr "(Ingen tilgjengelig)"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
 msgid "Search results"
 msgstr "Søkeresultater"
 
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
 msgid "Search results (none)"
 msgstr "Søkeresultater (ingen)"
 
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
 #, fuzzy
 msgid "Please wait, searching..."
 msgstr "Vennligst vent, søker i filer..."
 
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
 msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
 msgid "Addable"
 msgstr "Kan legge til"
 
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
 msgid "Upgradable"
 msgstr "Kan oppgraderes"
 
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
 #, fuzzy
 msgid "Not selected"
 msgstr ""
 "Fjern\n"
 "alle"
 
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
 #, fuzzy
 msgid "Selected"
 msgstr "Velg alle"
 
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
 msgid "One of the following packages is needed:"
 msgstr "En av følgende pakker behøves:"
 
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
 msgid "Please choose"
 msgstr "Vennligst velg"
 
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
 msgid "unknown package "
 msgstr "Ukjent pakke "
 
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
 msgid "Please wait, listing packages..."
 msgstr "Vennligst vent, lister pakker..."
 
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
 msgid "No update"
 msgstr "Ingen oppdatering"
 
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
 msgid ""
 "The list of updates is void. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -488,11 +520,11 @@ msgstr ""
 "noen tilgjengelige oppdateringer for pakkene som er installert på\n"
 "din maskin, eller at du allerede har installert alle sammen."
 
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
 msgid "Some additional packages need to be removed"
 msgstr "Noen ytterligere pakker renger å fjernes"
 
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -502,11 +534,11 @@ msgstr ""
 "å bli fjernet:\n"
 "\n"
 
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
 msgid "Some packages can't be removed"
 msgstr "Noen pakker kan ikke fjernes"
 
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -516,11 +548,11 @@ msgstr ""
 "vekk nå:\n"
 "\n"
 
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
 msgid "Additional packages needed"
 msgstr "Ytterligere pakker trengs"
 
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -530,11 +562,11 @@ msgstr ""
 "installeres:\n"
 "\n"
 
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
 msgid "Some packages can't be installed"
 msgstr "Noen pakker kan ikke installeres"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -542,21 +574,21 @@ msgstr ""
 "Beklager, følgende pakke(r) kan ikke velges:\n"
 "\n"
 
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
 msgid "Some packages need to be removed"
 msgstr "Noen pakker må fjernes"
 
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
 #, fuzzy, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valgte: %d MB / Tilgjengelig: %d MB"
 
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Størrelse valgte: %d MB"
 
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
 #, c-format
 msgid ""
 "%sFiles:\n"
@@ -566,12 +598,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
 #, fuzzy, c-format
 msgid "Source: %s\n"
 msgstr "Kilde"
 
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -592,7 +624,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -611,70 +643,70 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
 msgid "Bugfixes updates"
 msgstr "Bugfix-oppdateringer"
 
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
 msgid "Normal updates"
 msgstr "Normale oppdateringer"
 
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
 msgid "Mandrake choices"
 msgstr "Mandrake valg"
 
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
 msgid "All packages, alphabetical"
 msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
 msgid "All packages,"
 msgstr "Alle pakker,"
 
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
 msgid "by group"
 msgstr "ved gruppe"
 
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
 msgid "by size"
 msgstr "ved størrelse"
 
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
 msgid "by selection state"
 msgstr "ved utvelgelsestilstand"
 
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
 msgid "by source repository"
 msgstr "ved kildelager"
 
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
 msgid "by update availability"
 msgstr "ved oppdateringstilgjengelighet"
 
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
 #, fuzzy
 msgid "in descriptions"
 msgstr "Beskrivelser"
 
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
 msgid "in names"
 msgstr ""
 
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
 #, fuzzy
 msgid "in files"
 msgstr "Lokale filer"
 
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
 msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
 #, fuzzy
 msgid "Normal information"
 msgstr "Normale oppdateringer"
 
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -689,35 +721,35 @@ msgstr ""
 "\n"
 "ER det ok å fortsette?"
 
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
 msgid "Find:"
 msgstr "Finn:"
 
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
 msgid "Search"
 msgstr "søk"
 
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
 msgid "Install"
 msgstr "Installer"
 
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
 msgid "Software Packages Removal"
 msgstr "Fjerning av programvarepakker"
 
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
 msgid "Software Packages Installation"
 msgstr "Installasjon av programvarepakker"
 
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -729,23 +761,23 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "Vennligst vent, kontakter speil for å oppdatere pakkeinformasjon."
 
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
 msgid "Error updating medium"
 msgstr "Feil ved oppdatering av media"
 
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "Det oppsto en uidentifistert feil ved oppdatering av pakkeinformasjon."
 
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -754,15 +786,15 @@ msgid ""
 "Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "Vennligst vent, kontakter speil for å initialisere oppdateringspakker."
 
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
 msgid "Error adding update medium"
 msgstr "Kunne ikke legge til oppdateringsmedia"
 
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -784,48 +816,52 @@ msgstr ""
 "\n"
 "Vil du prøve et annet speil?"
 
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
 msgid "Please wait, finding available packages..."
 msgstr "Vennligst vent, finner tilgjengelige pakker..."
 
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
 msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
 msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
 #, fuzzy
 msgid "Installation finished"
 msgstr "Installasjon mislykket"
 
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
 #, fuzzy, c-format
 msgid "Remove .%s"
 msgstr "Fjern"
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
 #, c-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
 msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
 #, fuzzy
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -834,44 +870,40 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
 #, fuzzy
 msgid ""
 "some packages failed to install\n"
 "correctly"
 msgstr "Noen pakker kan ikke installeres"
 
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
 #, fuzzy
 msgid "everything was installed correctly"
 msgstr "Alt er allerede installert."
 
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
 msgid "Unable to get source packages."
 msgstr "Ikke i stand til å få tak i kildepakker."
 
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
 msgid "Unable to get source packages, sorry."
 msgstr "Ikke i stand til å få tak i kildepakker, beklager."
 
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
 msgid "Change medium"
 msgstr "Endre media"
 
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vennligst sett inn media kalt \"%s\" på enhet [%s]"
 
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
 msgid "Installation failed"
 msgstr "Installasjon mislykket"
 
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -879,36 +911,36 @@ msgstr ""
 "Installasjon mislykket, noen filer mangler.\n"
 "Du vil kanskje oppdatere din kildedatabase."
 
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 "Vennligst vent, fjerner pakker for at andre skal kunne bli oppgradert..."
 
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
 msgid "Program missing"
 msgstr ""
 
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr ""
 
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
 msgid "Everything already installed."
 msgstr "Alt er allerede installert."
 
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "Alt er allerede installert (skal dette skje i det hele tatt?)."
 
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
 msgid "Please wait, reading packages database..."
 msgstr "Vennligst vent, leser pakkedatabase..."
 
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
 msgid "Please wait, removing packages..."
 msgstr "Vennligst vent, fjerner pakker..."
 
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -920,7 +952,7 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge vilken programvare du skal fjerne\n"
 "fra maskinen din."
 
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -932,7 +964,7 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
 "på maskinen din."
 
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1174,9 +1206,6 @@ msgstr "Installer alle"
 #~ msgid "Force"
 #~ msgstr "Tving"
 
-#~ msgid "Error..."
-#~ msgstr "Feil..."
-
 #~ msgid "Problems occured during installation"
 #~ msgstr "Det oppsto problemer under installasjonen"
 
@@ -1477,9 +1506,6 @@ msgstr "Installer alle"
 #~ msgid "Ftp Proxy:"
 #~ msgstr "Ftp proxy:"
 
-#~ msgid "Proxy username:"
-#~ msgstr "Proxy brukernavn:"
-
 #~ msgid "Proxy password:"
 #~ msgstr "Proxy passord:"
 
@@ -1519,9 +1545,6 @@ msgstr "Installer alle"
 #~ msgid "Choose Packages"
 #~ msgstr "Velg pakker"
 
-#~ msgid "Username:"
-#~ msgstr "Brukernavn:"
-
 #~ msgid "Security"
 #~ msgstr "Sikkerhet"