sync with code

1 files changed, 19 insertions, 22 deletions

diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 993e33dcd..f2a5ab996 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia DrakX.cy\n"
-"POT-Creation-Date: 2011-04-17 17:24+0300\n"
+"POT-Creation-Date: 2011-04-29 01:59+0200\n"
 "PO-Revision-Date: 2009-10-01 20:12-0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Cymraeg <post@meddal.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: Welsh\n"
 "X-Poedit-Country: UNITED KINGDOM\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -553,7 +553,7 @@ msgstr ""
 "pa iaith yr hoffech ei osod. Byddant ar gael pan fydd eich gosodiad\n"
 "wedi ei gwblhau a phan fyddwch yn ail gychwyn eich system."
 
-#: any.pm:1140
+#: any.pm:1140 fs/partitioning_wizard.pm:172
 #, c-format
 msgid "Mageia"
 msgstr ""
@@ -2636,11 +2636,11 @@ msgstr "Pa raniad hoffech newid ei faint?"
 msgid ""
 "Your Microsoft Windows® partition is too fragmented. Please reboot your "
 "computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
-"the Mageia installation."
+"the %s installation."
 msgstr ""
 "Mae eich rhaniad Microsoft Windows® yn rhy ddarniog. Ailgychwynnwch eich "
 "cyfrifiadur yn Microsoft Windows®, a rhedeg y rhaglen `defrag'', yna "
-"ailgychwyn gosod Mageia."
+"ailgychwyn gosod %s."
 
 #: fs/partitioning_wizard.pm:180
 #, c-format
@@ -4831,13 +4831,13 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the Mageia "
-"Linux distribution \n"
+"distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mageia distribution, and "
-"any applications \n"
+"system and the different components of the Mageia distribution, and any "
+"applications \n"
 "distributed with these products provided by Mageia's licensors or "
 "suppliers.\n"
 "\n"
@@ -4894,8 +4894,8 @@ msgid ""
 "judgment, or any \n"
 "other consequential loss) arising out of the possession and use of software "
 "components or \n"
-"arising out of  downloading software components from one of Mageia "
-"sites which are \n"
+"arising out of  downloading software components from one of Mageia sites "
+"which are \n"
 "prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -4933,8 +4933,7 @@ msgid ""
 "Mageia and its suppliers and licensors reserves their rights to modify or "
 "adapt the Software \n"
 "Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\", \"Mageia\" and associated logos are trademarks of "
-"Mageia  \n"
+"\"Mageia\", \"Mageia\" and associated logos are trademarks of Mageia  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5015,8 +5014,8 @@ msgstr ""
 "busnes, tarfu ar fusnes,\n"
 "colled ariannol, costau cyfreithiol, a chosb o ganlyniad i achos llys, neu "
 "unrhyw golled o ganlyniad) yn\n"
-"codi o lwytho i lawr cydrannau meddalwedd o un o safleoedd  Mageia, "
-"sydd wedi eu gwahardd neu eu\n"
+"codi o lwytho i lawr cydrannau meddalwedd o un o safleoedd  Mageia, sydd "
+"wedi eu gwahardd neu eu\n"
 "hatal mewn rhai gwledydd gan gyfreithiau lleol. \n"
 "Mae'r cyfrifoldeb cyfyngedig hwn yn perthyn i, ond heb ei gyfyngu i'r, "
 "cydrannau cryptograffiaeth cryf\n"
@@ -5054,8 +5053,8 @@ msgstr ""
 "Mae Mageia, ei gyflenwyr a'i drwyddedwyr yn cadw eu hawl i newid neu "
 "addasu'r Cynnyrch Meddalwedd,\n"
 "yn rhannol neu yn gyfan, drwy unrhyw ddull ac ar gyfer unrhyw bwrpas.\n"
-"Mae \"Mageia\", \"Mageia\"  a'r logos cysylltiedig yn nodau masnachol "
-"sy'n perthyn i Mageia\n"
+"Mae \"Mageia\", \"Mageia\"  a'r logos cysylltiedig yn nodau masnachol sy'n "
+"perthyn i Mageia\n"
 "\n"
 "\n"
 "5. Cyfreithiau Llywodraethol\n"
@@ -5099,8 +5098,7 @@ msgid ""
 "Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mageia "
-"Linux,\n"
+"For information on fixes which are available for this release of Mageia,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5114,8 +5112,7 @@ msgstr ""
 "Tynnwch y cyfrwng cychwyn a chlicio Ailgychwyn.\n"
 "\n"
 "\n"
-"Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o Mageia "
-"Linux,\n"
+"Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o Mageia \n"
 "cysylltwch â'r atodiad, sydd i'w gael yn:\n"
 "\n"
 "\n"
@@ -6772,8 +6769,8 @@ msgstr ""
 "\n"
 " Dylech fod wedi derbyn copi o Drwydded Gyhoeddus Gyffredinol GNU\n"
 " gyda'r rhaglen; os nad, ysgrifennwch at:\n"
-" Free Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
-"1301, USA.\n"
+" Free Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA.\n"
 
 #: standalone.pm:44
 #, c-format