merge

1 files changed, 312 insertions, 268 deletions

diff --git a/po/no.po b/po/no.po
index c44af36e..0c798491 100644
--- a/po/no.po
+++ b/po/no.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-02-13 17:56+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norsk Bokmål <cooker-i18n@linux-mandrake.com>\n"
@@ -20,14 +20,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Fjern .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Vennligst vent, oppdaterer media..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -35,12 +45,7 @@ msgstr "Canada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -58,25 +63,20 @@ msgstr "alt ble installert korrekt"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Du må fylle opp minst de to første inngangene."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr ""
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Oppdateringer utvikling"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr ""
+msgid "You need to fill up at least the two first entries."
+msgstr "Du må fylle opp minst de to første inngangene."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -111,6 +111,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Søkeresultater"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -136,11 +141,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Hvordan velge ditt speil manuelt"
 
@@ -154,6 +154,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Forbereder pakker for installasjon..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -171,21 +176,31 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Installer"
+msgid "True type"
+msgstr "Type"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Base"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Graphics"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Installer"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -197,11 +212,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "En av følgende pakker behøves:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Oppdateringer utvikling"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -219,7 +229,7 @@ msgstr "Feil..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -323,21 +333,11 @@ msgid "Password:"
 msgstr "Passord:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Beskrivelser"
@@ -357,6 +357,11 @@ msgstr "Noen ytterligere pakker renger å fjernes"
 msgid "All packages, by update availability"
 msgstr "ved oppdateringstilgjengelighet"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -373,6 +378,11 @@ msgid "Greece"
 msgstr "Hellas"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Ikke gjør noe"
@@ -426,11 +436,6 @@ msgstr "Velg et speil..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -502,6 +507,11 @@ msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laster ned pakke `%s' (%s/%s)..."
 
@@ -512,6 +522,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Andre"
 
@@ -520,60 +535,50 @@ msgstr "Andre"
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Østerrike"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Austria"
+msgstr "Østerrike"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Oppdateringer utvikling"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Sjekk..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Oppsummering"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Oppdateringer utvikling"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -590,6 +595,11 @@ msgstr "Fjern .%s"
 msgid "Importance: "
 msgstr "Viktighet: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -633,11 +643,6 @@ msgid "Medium"
 msgstr "Belgia"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Størrelse"
@@ -662,11 +667,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Oppdaterer kilde(r)"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Oppdateringer utvikling"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -702,6 +702,11 @@ msgstr "Det oppsto problemer under installasjonen"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -712,16 +717,6 @@ msgstr "Rediger"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valgte: %d MB / Ledig diskplass: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Andre"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -744,11 +739,6 @@ msgstr "Utforsker fil fra kilde `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "i filer"
 
@@ -758,13 +748,18 @@ msgid "All packages, by group"
 msgstr "Alle pakker,"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "generell"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -779,6 +774,16 @@ msgstr "Søkeresultater (ingen)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -797,11 +802,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Stopp"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Vennligst vent, oppdaterer media..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -857,6 +877,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finland"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -873,13 +898,13 @@ msgid "Save changes"
 msgstr "Lagrer endringer"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Innstillinger nettverk:"
+#, c-format
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -890,6 +915,11 @@ msgstr "Mere info"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "søk"
 
@@ -914,16 +944,6 @@ msgid "Spain"
 msgstr "Spania"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Oppdateringer utvikling"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Kunne ikke legge til oppdateringsmedia"
@@ -934,11 +954,6 @@ msgid "Files:\n"
 msgstr "/_Fil"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Velg pakkene dine"
@@ -948,6 +963,11 @@ msgstr "Velg pakkene dine"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Du kan spesifisere en /bruker/passord for proxy autentifiseringen:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Kina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -959,11 +979,6 @@ msgid "Additional packages needed"
 msgstr "Ytterligere pakker trengs"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Nettverk"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -1023,9 +1038,9 @@ msgid "Find:"
 msgstr "Finn:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Oppdateringer utvikling"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1038,11 +1053,6 @@ msgid "Removable device"
 msgstr "Fjernbar enhet"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Forbereder pakker for installasjon..."
@@ -1059,21 +1069,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr "Vennligst vent, legger til media..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Andre"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Logg inn:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Nettverk"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1084,21 +1084,16 @@ msgstr "Belgia"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Konfigurer proxier"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Advarsel"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1106,11 +1101,6 @@ msgstr "Verifiserer signatur av `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1124,16 +1114,6 @@ msgstr "Fil feil"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Java"
-msgstr "Oppdateringer utvikling"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1145,12 +1125,7 @@ msgstr "Kan ikke oppdatere media, den vil bli automatisk slått av."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1165,25 +1140,20 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Rediger kilde \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Grunn til oppdatering: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Konfigurer kilder"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Grunn til oppdatering: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1212,7 +1182,7 @@ msgstr "Problem under fjerning"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1237,23 +1207,38 @@ msgid "No package found for installation."
 msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Type"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Beskrivelser"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1261,6 +1246,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Alle pakker ble vellykket installert"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1288,11 +1283,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Nettverk"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Navn: %s"
 
@@ -1338,7 +1328,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1355,12 +1345,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Maksimum informasjon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1418,8 +1418,8 @@ msgstr "Vis bugfiks-oppdateringer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Nettverk"
+msgid "Java"
+msgstr "Japan"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1438,20 +1438,15 @@ msgstr ""
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Slått på?"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr ""
+msgid "Enabled?"
+msgstr "Slått på?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1478,16 +1473,6 @@ msgstr "Installert"
 msgid " done."
 msgstr " ferdig."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Oppdateringer utvikling"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1495,13 +1480,13 @@ msgstr "Du må sette inn mediumet for å fortsette"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "For mange pakker er valgt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "For mange pakker er valgt"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1513,17 +1498,17 @@ msgstr "Ikke gjør noe"
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Nettverk"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Feil under nedlasting"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
@@ -1533,6 +1518,11 @@ msgstr "Hjelp"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Du må være root for å installere pakker, beklager"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1560,7 +1550,7 @@ msgstr "ved kildelager"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1573,6 +1563,11 @@ msgstr "Nedlastning av `%s', tid som gjenstår:%s, hastighet:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Oppdateringer utvikling"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1600,11 +1595,6 @@ msgstr "Endre media"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Resett valget"
 
@@ -1613,6 +1603,11 @@ msgstr "Resett valget"
 msgid "Mandrake Update"
 msgstr "MandrakeUpdates valg"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Andre"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1630,12 +1625,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1651,6 +1646,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1688,22 +1688,12 @@ msgstr "Installert versjon: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Oppdateringer utvikling"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Navn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1728,7 +1718,7 @@ msgstr "Navn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1736,6 +1726,11 @@ msgstr ""
 msgid "No update"
 msgstr "Utfør oppdateringer"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Nettverk"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1746,6 +1741,16 @@ msgstr "Ok"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1758,6 +1763,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1766,11 +1776,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Rediger kilde \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1834,11 +1839,6 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
 "på maskinen din."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2122,6 +2122,62 @@ msgid "Software Sources Manager"
 msgstr "Programvare kilde håndterer"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP tjener"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Innstillinger nettverk:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Nettverk"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Andre"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Nettverk"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Nettverk"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Nettverk"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "er i konflikt"
 
@@ -2389,9 +2445,6 @@ msgstr "Programvare kilde håndterer"
 #~ msgid "security"
 #~ msgstr "sikkerhet"
 
-#~ msgid "general"
-#~ msgstr "generell"
-
 #~ msgid "bugfix"
 #~ msgstr "bugfiks"
 
@@ -2409,9 +2462,6 @@ msgstr "Programvare kilde håndterer"
 #~ "Kan ikke motta liste over pakker for oppdatering\n"
 #~ "Prøv med et annet speil"
 
-#~ msgid "Warning"
-#~ msgstr "Advarsel"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2486,15 +2536,9 @@ msgstr "Programvare kilde håndterer"
 #~ msgid "/Help/_About..."
 #~ msgstr "/Hjelp/_Om..."
 
-#~ msgid "Name"
-#~ msgstr "Navn"
-
 #~ msgid "Installed"
 #~ msgstr "Installert"
 
-#~ msgid "Type"
-#~ msgstr "Type"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, version 7.2\n"