fix media/medias by medium/media

1 files changed, 127 insertions, 123 deletions

diff --git a/po/cy.po b/po/cy.po
index 26a59fec..7d9a11ab 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-28 20:14+0200\n"
+"POT-Creation-Date: 2003-05-30 12:10+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"
@@ -55,11 +55,6 @@ msgid "Verifying packages signatures..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure medias"
-msgstr "Ffurfweddu'r ffynonellau"
-
-#: ../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"
@@ -79,6 +74,16 @@ msgstr ""
 msgid "System/XFree86"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of medium:"
+msgstr "Math o ffynonellau:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for medium `%s'..."
+msgstr "Copïo ffeil fel ffynhonell '%s'..."
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "France"
@@ -140,6 +145,11 @@ msgstr "Sut i ddewis drych gyda llaw."
 msgid "Package installation..."
 msgstr "Paratoi pecynnau i'w gosod"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media you wish to update:"
+msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Software Packages Removal"
@@ -327,6 +337,11 @@ msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 msgid "All packages, by update availability"
 msgstr "yn ôl diweddariad"
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure media"
+msgstr "Ffurfweddu'r ffynonellau"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "United States"
@@ -363,11 +378,6 @@ msgstr ""
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a media"
-msgstr "Ychwanegu ffynhonnell"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Poland"
@@ -422,18 +432,8 @@ msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid ""
-"Welcome to the Software Medias Manager!\n"
-"\n"
-"This tool will help you configure the packages medias you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Croeso i'r golygydd ffynhonnell pecynnau!\n"
-"\n"
-"Bydd yr offeryn yn eich cynorthwyo i ffurfweddu'r ffynhonnell pecynnau\n"
-"rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
-"pecynnau newydd neu er mwyn diweddaru."
+msgid "Add a medium"
+msgstr "Ychwanegu ffynhonnell"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -457,6 +457,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining file of medium `%s'..."
+msgstr "Archwilio ffeil y ffynhonell '%s'..."
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Path:"
@@ -478,11 +483,6 @@ msgid "Sweden"
 msgstr "Sweden"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Select the media(s) you wish to update:"
-msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
-
-#: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "Awstria"
@@ -497,11 +497,6 @@ msgstr "Gwybodaeth..."
 msgid "Networking/File transfer"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Type of media:"
-msgstr "Math o ffynonellau:"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Development/Other"
@@ -517,17 +512,6 @@ msgstr "Archwilio..."
 msgid "Games/Cards"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"You already have at least one update media configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Medias Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -573,11 +557,6 @@ msgstr "Tynnu .%s"
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by media repository"
-msgstr "yn ôl ffynhonnell eu tarddiad"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -598,16 +577,31 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Media Manager!\n"
+"\n"
+"This tool will help you configure the packages media you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Croeso i'r golygydd ffynhonnell pecynnau!\n"
+"\n"
+"Bydd yr offeryn yn eich cynorthwyo i ffurfweddu'r ffynhonnell pecynnau\n"
+"rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
+"pecynnau newydd neu er mwyn diweddaru."
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Medium"
+msgstr "Gwlad Belg"
+
 #: ../rpmdrake:1
 #, c-format
 msgid "System/Internationalization"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Examining file of media `%s'..."
-msgstr "Archwilio ffeil y ffynhonell '%s'..."
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Size: "
@@ -628,6 +622,11 @@ msgstr "Gosodwyd popeth yn llwyddiannus"
 msgid "unknown package "
 msgstr "Methu agor pecyn `%s'\n"
 
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media"
+msgstr "Diweddaru ffynonellau"
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Development/Databases"
@@ -698,6 +697,11 @@ msgstr "Diweddariadau diogelwch"
 msgid "Korea"
 msgstr "Corea"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining remote file of medium `%s'..."
+msgstr "Archwilio ffeil y ffynhonell '%s'..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Games/Adventure"
@@ -720,11 +724,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Media: "
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Games/Sports"
 msgstr ""
 
@@ -759,6 +758,11 @@ msgid "Stop"
 msgstr "Atal"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a medium"
+msgstr "Golygu ffynhonnell"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
@@ -809,21 +813,6 @@ msgid "Save changes"
 msgstr "Cadw newidiadau"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Medias Manager, and then add a `Security\n"
-"updates' media.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Cewch ddewis eich drych eich hun, i wneud hynny\n"
-"cychwynnwch y Rheolwr Ffynonellau Meddalwedd, ac ychwanegu\n"
-"ffynhonnell 'Diweddariadau Diogelwch'.\n"
-"\n"
-"Yna ailgychwynnwch MandrakeUpdate."
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Networking/News"
 msgstr ""
@@ -874,11 +863,6 @@ msgstr ""
 msgid "Development/Kernel"
 msgstr ""
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update media(s)"
-msgstr "Diweddaru ffynonellau"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Files:\n"
@@ -890,6 +874,11 @@ msgid "Games/Arcade"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Already existing update media"
+msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
@@ -920,6 +909,26 @@ msgid "Running in user mode"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Media Manager, and then add a `Security\n"
+"updates' medium.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Cewch ddewis eich drych eich hun, i wneud hynny\n"
+"cychwynnwch y Rheolwr Ffynonellau Meddalwedd, ac ychwanegu\n"
+"ffynhonnell 'Diweddariadau Diogelwch'.\n"
+"\n"
+"Yna ailgychwynnwch MandrakeUpdate."
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a medium:"
+msgstr "Ychwanegu ffynhonnell"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -930,11 +939,6 @@ msgstr ""
 "hefyd: \n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing media \"%s\":"
-msgstr "Golygu ffynhonnell \"%s\":"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Please wait, listing packages..."
@@ -942,6 +946,17 @@ msgstr "Arhoswch, rhestri pecynnau..."
 
 #: ../rpmdrake:1
 #, c-format
+msgid ""
+"You already have at least one update medium configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Media Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Find:"
 msgstr "Canfod:"
 
@@ -955,11 +970,6 @@ msgstr ""
 msgid "Normal information"
 msgstr "Gwybodaeth arferol"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Copying file for media `%s'..."
-msgstr "Copïo ffeil fel ffynhonell '%s'..."
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Removable device"
@@ -1142,15 +1152,6 @@ msgstr ""
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your medias database."
-msgstr ""
-"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
-"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
 "There was a problem during the installation:\n"
 "\n"
 "%s"
@@ -1166,6 +1167,11 @@ msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Medium: "
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
@@ -1223,11 +1229,6 @@ msgstr ""
 msgid "Networking/IRC"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Media"
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Name: "
@@ -1288,11 +1289,6 @@ msgstr "Dewiswyd"
 msgid "Maximum information"
 msgstr "Gwybodath lawn"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Examining distant file of media `%s'..."
-msgstr "Archwilio ffeil pell y ffynhonell '%s'..."
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Archiving/Backup"
@@ -1417,6 +1413,15 @@ msgid "Development/KDE and Qt"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your media database."
+msgstr ""
+"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
+"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Books/Howtos"
 msgstr ""
@@ -1466,11 +1471,6 @@ msgstr "Cymorth"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Rhaid eich bod yn wraidd i osod pecyn."
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Edit a media"
-msgstr "Golygu ffynhonnell"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1487,6 +1487,11 @@ msgid "Germany"
 msgstr "Yr Almaen"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages, by medium repository"
+msgstr "yn ôl ffynhonnell eu tarddiad"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "System/Fonts/X11 bitmap"
 msgstr ""
@@ -1521,11 +1526,6 @@ msgstr "Newid cyfrwng"
 msgid "Graphical desktop/GNOME"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a media:"
-msgstr "Ychwanegu ffynhonnell"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Reset the selection"
@@ -1594,11 +1594,6 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Already existing update medias"
-msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
@@ -1668,6 +1663,11 @@ msgstr ""
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing medium \"%s\":"
+msgstr "Golygu ffynhonnell \"%s\":"
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Networking/Instant messaging"
@@ -2001,6 +2001,10 @@ msgstr "Tynnu Meddalwedd"
 msgid "Software Sources Manager"
 msgstr "Rheolwr Ffynhonnell Meddalwedd"
 
+#, fuzzy
+#~ msgid "Examining distant file of media `%s'..."
+#~ msgstr "Archwilio ffeil pell y ffynhonell '%s'..."
+
 #~ msgid "Save and quit"
 #~ msgstr "Cadw a gadael"