merge

1 files changed, 252 insertions, 248 deletions

diff --git a/po/cy.po b/po/cy.po
index b7c33506..60022cf1 100644
--- a/po/cy.po
+++ b/po/cy.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-17 22:21-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -19,14 +19,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Tynnu .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -34,12 +44,7 @@ msgstr "Canada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -57,25 +62,20 @@ msgstr "gosodwyd popeth yn llwyddiannus"
 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 "Mae angen llanw o leiaf y ddau gofnod cyntaf"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Networking"
+msgid "KDE and Qt"
 msgstr ""
 
-#: ../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 "Mae angen llanw o leiaf y ddau gofnod cyntaf"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -110,6 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -135,11 +140,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
@@ -153,6 +153,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Paratoi pecynnau i'w gosod"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -170,19 +175,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Yr Eidal"
+msgid "True type"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphics"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Yr Eidal"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -196,11 +211,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -218,7 +228,7 @@ msgstr "Gwall..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -321,22 +331,12 @@ msgid "Password:"
 msgstr "Cyfrinair:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "disgrifiadau"
 
@@ -355,6 +355,11 @@ msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 msgid "All packages, by update availability"
 msgstr "yn ôl diweddariad"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -371,6 +376,11 @@ msgid "Greece"
 msgstr "Groeg"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Gwneud dim"
@@ -424,11 +434,6 @@ msgstr "Dewis drych..."
 
 #: ../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"
@@ -492,6 +497,11 @@ msgstr "Llwybr:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
@@ -502,6 +512,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Arall"
 
@@ -510,36 +525,31 @@ msgstr "Arall"
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Awstria"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Gwybodaeth..."
+msgid "Austria"
+msgstr "Awstria"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr ""
+msgid "Info..."
+msgstr "Gwybodaeth..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -547,22 +557,17 @@ msgstr "Siapan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Crynodeb: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
+msgid "Boot and Init"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -580,6 +585,11 @@ msgstr "Tynnu .%s"
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -622,11 +632,6 @@ msgstr "Gwlad Belg"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Maint: "
 
@@ -650,11 +655,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Diweddaru ffynonellau"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -690,6 +690,11 @@ msgstr "Digwyddodd anhawster wrth osod"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -700,16 +705,6 @@ msgstr "Golygu"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Arall"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -732,11 +727,6 @@ msgstr "Archwilio ffeil y ffynhonell '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "mewn ffeiliau"
 
@@ -747,12 +737,17 @@ msgstr "Pob pecyn,"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Kernel"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -767,6 +762,16 @@ msgstr "Canlyniadau'r chwilio (dim)"
 
 #: ../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"
@@ -785,11 +790,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Atal"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
+#: ../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"
@@ -845,6 +865,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Ffindir"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -862,12 +887,12 @@ msgstr "Cadw newidiadau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/News"
+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
@@ -878,6 +903,11 @@ msgstr "Mwy o wybodaeth"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Chwilio"
 
@@ -902,16 +932,6 @@ msgid "Spain"
 msgstr "Sbaen"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
@@ -923,11 +943,6 @@ msgstr "Ffeiliau:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
@@ -936,6 +951,11 @@ msgstr "Methu estyn pecynnau ffynhonnell."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Mae modd i chi enwi defnyddiwr /cyfrinair ar gyfer dilysiad dirprwy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Tseina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -948,11 +968,6 @@ msgstr "Pecynnau ychwanegol angenrheidiol"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1010,7 +1025,7 @@ msgstr "Canfod:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1024,11 +1039,6 @@ msgid "Removable device"
 msgstr "Dyfais symudol"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod"
@@ -1043,21 +1053,11 @@ msgstr "Arhoswch tynnu'r pecynnau..."
 msgid "Please wait, adding medium..."
 msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Arall"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1068,21 +1068,16 @@ msgstr "Gwlad Belg"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Ffurfweddu'r dirprwyon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Ffurfweddu'r dirprwyon"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1090,11 +1085,6 @@ msgstr "Gwirio llofnod `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1108,16 +1098,6 @@ msgstr "Gwall ffeil"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1129,12 +1109,7 @@ msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1147,25 +1122,20 @@ msgstr "Dewiswch ddrych"
 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 "Golygu ffynhonnell \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Ffurfweddu'r ffynonellau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1194,7 +1164,7 @@ msgstr "Problem wrth dynnu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1220,22 +1190,37 @@ msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1243,6 +1228,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1270,11 +1265,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Enw: "
 
@@ -1320,7 +1310,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1335,12 +1325,22 @@ msgstr "Dewiswyd"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Gwybodath lawn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1397,9 +1397,9 @@ msgid "Bugfixes updates"
 msgstr "Diweddariad cywiro gwallau"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Siapan"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1416,20 +1416,15 @@ msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Galluogwyd?"
-
 #: ../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 "Galluogwyd?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1456,16 +1451,6 @@ msgstr "Gorffennodd y gosodiad"
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1473,13 +1458,13 @@ msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Mae gormod o becynnau wedi eu dewis"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Mae gormod o becynnau wedi eu dewis"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1491,17 +1476,17 @@ msgstr "Gwneud dim"
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
@@ -1511,6 +1496,11 @@ msgstr "Cymorth"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Rhaid eich bod yn wraidd i osod pecyn."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1538,7 +1528,7 @@ msgstr "yn ôl ffynhonnell eu tarddiad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1551,6 +1541,11 @@ msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1578,11 +1573,6 @@ msgstr "Newid cyfrwng"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Ailosod y dewis"
 
@@ -1591,6 +1581,11 @@ msgstr "Ailosod y dewis"
 msgid "Mandrake Update"
 msgstr "Diweddaru Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Arall"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1608,12 +1603,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
@@ -1629,6 +1624,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1665,23 +1665,13 @@ msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Arall"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1706,7 +1696,7 @@ msgstr "Enw:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1714,6 +1704,11 @@ msgstr ""
 msgid "No update"
 msgstr "Dim diweddariad"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Gwneud dim"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1724,6 +1719,16 @@ msgstr "Iawn"
 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:"
@@ -1736,6 +1741,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1744,11 +1754,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Golygu ffynhonnell \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1811,11 +1816,6 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2098,6 +2098,10 @@ msgid "Software Sources Manager"
 msgstr "Rheolwr Ffynhonnell Meddalwedd"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "Gwasanaethwr FTP"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr " gwrthdaro gyda"