sync with code

1 files changed, 38 insertions, 31 deletions

diff --git a/po/cy.po b/po/cy.po
index 2c292920..da9c82fb 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-27 21:09+0100\n"
+"POT-Creation-Date: 2012-03-21 08:44+0100\n"
 "PO-Revision-Date: 2009-08-24 20:33-0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Cymraeg\n"
@@ -256,7 +256,7 @@ msgstr ""
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:155 ../urpmi:632
+#: ../gurpmi2:155 ../urpmi:642
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -297,13 +297,13 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:276 ../urpmi:599
+#: ../gurpmi2:276 ../urpmi:609
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
 
-#: ../gurpmi2:277 ../urpmi:600
+#: ../gurpmi2:277 ../urpmi:610
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -331,7 +331,7 @@ msgstr "Paratoi..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:343 ../urpmi:627
+#: ../gurpmi2:343 ../urpmi:637
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
@@ -384,7 +384,7 @@ msgstr "Cwblhawyd y gosod"
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:427 ../urpmi:695
+#: ../gurpmi2:427 ../urpmi:705
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -599,22 +599,22 @@ msgstr "nid yw cyfrwng \"%s\" ar gael"
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
-#: ../urpm/cfg.pm:81
+#: ../urpm/cfg.pm:82
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "gwall cystrawen yn ffeil config ar linell %s"
 
-#: ../urpm/cfg.pm:114
+#: ../urpm/cfg.pm:115
 #, c-format
 msgid "unable to read config file [%s]"
 msgstr "Methu creu ffeil config (%s)"
 
-#: ../urpm/cfg.pm:140
+#: ../urpm/cfg.pm:141
 #, c-format
 msgid "medium `%s' is defined twice, aborting"
 msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:541
+#: ../urpm/cfg.pm:252 ../urpm/media.pm:541
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
@@ -796,27 +796,27 @@ msgstr "methu gosod pecyn %s"
 msgid "removing bad rpm (%s) from %s"
 msgstr "tynnu rpm gwallus (%s) o %s"
 
-#: ../urpm/install.pm:213 ../urpm/install.pm:277
+#: ../urpm/install.pm:213 ../urpm/install.pm:278
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "tynnu %s methodd: %s"
 
-#: ../urpm/install.pm:258
+#: ../urpm/install.pm:259
 #, c-format
 msgid "Removing package %s"
 msgstr "Tynnu pecyn %s."
 
-#: ../urpm/install.pm:259
+#: ../urpm/install.pm:260
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:276
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "tynnu rpm wedi eu gosod (%s) o %s"
 
-#: ../urpm/install.pm:284
+#: ../urpm/install.pm:285
 #, c-format
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
@@ -1022,6 +1022,11 @@ msgstr ""
 "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
 "sortmedia, --diweddaru, --use-distrib or --parallel"
 
+#: ../urpm/media.pm:719
+#, c-format
+msgid "Search start: %s end: %s"
+msgstr "Cychwyn chwilio: %s diwedd: %s"
+
 #: ../urpm/media.pm:736
 #, c-format
 msgid "skipping package %s"
@@ -1263,7 +1268,7 @@ msgstr "wedi canfod geolleoleiddio %s %.2f %.2f  o gylchfa amser %s"
 msgid "getting mirror list from %s"
 msgstr "estyn rhestr drychai o %s"
 
-#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:619
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:629
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -2483,7 +2488,7 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:497 ../urpmi:515 ../urpmi:620 ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:630 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2547,39 +2552,44 @@ msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Bydd y pecyn amddifad canlynol yn cael ei dynnu"
 msgstr[1] "Bydd y pecynnau amddifad canlynol yn cael eu tynnu"
 
-#: ../urpmi:602
+#: ../urpmi:600
+#, c-format
+msgid "WARNING: %s option is in use. Some strange problems may happen"
+msgstr ""
+
+#: ../urpmi:612
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
-#: ../urpmi:608
+#: ../urpmi:618
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
 
-#: ../urpmi:609
+#: ../urpmi:619
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Bydd %s o le ar ddisg ar gael."
 
-#: ../urpmi:610
+#: ../urpmi:620
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "bydd %s o becynnau yn cael eu hadfer."
 
-#: ../urpmi:611
+#: ../urpmi:621
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Parhau gyda gosod %d pecyn?"
 msgstr[1] "Parhau gyda gosod %d pecyn?"
 
-#: ../urpmi:632
+#: ../urpmi:642
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:640
+#: ../urpmi:650
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pwyso Enter pan wedi ei arosod..."
@@ -3351,13 +3361,13 @@ msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
 #: ../gurpmi.desktop.in.h:1
-msgid "Graphical front end to install RPM files"
-msgstr "Blaen graffigol ar gyfer gosod ffeiliau RPM"
-
-#: ../gurpmi.desktop.in.h:2
 msgid "Software Installer"
 msgstr "Gosodwr Meddalwedd"
 
+#: ../gurpmi.desktop.in.h:2
+msgid "Graphical front end to install RPM files"
+msgstr "Blaen graffigol ar gyfer gosod ffeiliau RPM"
+
 #, fuzzy
 #~ msgid ""
 #~ "# Here are logs of your DUDF uploads.\n"
@@ -3439,9 +3449,6 @@ msgstr "Gosodwr Meddalwedd"
 #~ msgid "due to already installed %s"
 #~ msgstr "oherwydd %s wedi ei osod eisoes"
 
-#~ msgid "Search start: %s end: %s"
-#~ msgstr "Cychwyn chwilio: %s diwedd: %s"
-
 #~ msgid ""
 #~ "  --from         - use specified url for list of mirrors, the default is\n"
 #~ "                   %s\n"