sync with code

1 files changed, 68 insertions, 86 deletions

diff --git a/perl-install/install/share/po/cy.po b/perl-install/install/share/po/cy.po
index 66eddc37c..f55432859 100644
--- a/perl-install/install/share/po/cy.po
+++ b/perl-install/install/share/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-02 16:49+0200\n"
+"POT-Creation-Date: 2008-09-11 18:46+0200\n"
 "PO-Revision-Date: 2008-08-27 08:19+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -20,6 +20,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: ../../advertising/IM_flash.pl:1
+#, c-format
+msgid "Your desktop on a USB key"
+msgstr "Eich bwrdd gwaith ar allwedd USB"
+
+#: ../../advertising/IM_free09.pl:1
+#, c-format
+msgid "The 100%% open source Mandriva Linux distribution"
+msgstr "Mandriva Linux - y dosbarthiad cod agored 100%%"
+
+#: ../../advertising/IM_one09.pl:1
+#, c-format
+msgid "Explore Linux easily with Mandriva One"
+msgstr "Arbrofi rhwydd gyda Mandriva One"
+
+#: ../../advertising/IM_pwp09.pl:1
+#, c-format
+msgid "A full Mandriva Linux desktop, with support"
+msgstr "Bwrdd gwaith Mandriva Linux llawn, gyda chefnogaeth"
+
+#: ../../advertising/IM_range09.pl:1
+#, c-format
+msgid "Mandriva: distributions for everybody's needs"
+msgstr "Mandriva: dosbarthiad ar gyfer angen pawb"
+
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -956,17 +981,17 @@ msgstr "Copïo'r CDau cyfan"
 msgid "An error occurred"
 msgstr "Digwyddodd gwall"
 
-#: steps_interactive.pm:98
-#, c-format
-msgid "Here is the full list of available keyboards"
-msgstr "Dyma restr lawn o'r bysellfyrddau sydd ar gael"
-
 #: steps_interactive.pm:102
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Dewiswch gynllun eich bysellfwrdd."
 
-#: steps_interactive.pm:135
+#: steps_interactive.pm:105
+#, c-format
+msgid "Here is the full list of available keyboards"
+msgstr "Dyma restr lawn o'r bysellfyrddau sydd ar gael"
+
+#: steps_interactive.pm:136
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Gosod/Diweddaru"
@@ -985,22 +1010,12 @@ msgstr ""
 "_:Enw yw hwn:\n"
 "Gosod"
 
-#: steps_interactive.pm:140
+#: steps_interactive.pm:144
 #, c-format
 msgid "Upgrade %s"
 msgstr "Diweddaru %s"
 
-#: steps_interactive.pm:144
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Nid yw diweddaru o ddosbarthiad 32did i 64did yn cael ei gynnal"
-
-#: steps_interactive.pm:148
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Nid yw diweddaru o ddosbarthiad 64did i 32did yn cael ei gynnal"
-
-#: steps_interactive.pm:167
+#: steps_interactive.pm:162
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Allwedd amgryptio ar gyfer %s"
@@ -1253,17 +1268,7 @@ msgstr ""
 "\n"
 "Ydych chi am osod y diweddariadau?"
 
-#: steps_interactive.pm:768
-#, c-format
-msgid "Contacting the mirror to get the list of available packages..."
-msgstr "Cysylltu â'r drych i estyn y rhestr o becynnau sydd ar gael..."
-
-#: steps_interactive.pm:774
-#, c-format
-msgid "Unable to contact mirror %s"
-msgstr "Methu canfod drych: %s."
-
-#: steps_interactive.pm:879
+#: steps_interactive.pm:849
 #, c-format
 msgid "%s on %s"
 msgstr "%s ar %s"
@@ -1401,42 +1406,6 @@ msgstr "Llongyfarchiadau"
 msgid "Reboot"
 msgstr "Ail gychwyn"
 
-#: steps_interactive.pm:1151 steps_interactive.pm:1152
-#, c-format
-msgid "Generate auto install floppy"
-msgstr "Creu disg meddal awto gosod"
-
-#: steps_interactive.pm:1153
-#, c-format
-msgid ""
-"The auto install can be fully automated if wanted,\n"
-"in that case it will take over the hard drive!!\n"
-"(this is meant for installing on another box).\n"
-"\n"
-"You may prefer to replay the installation.\n"
-msgstr ""
-"Mae modd awtomeiddio'r awto gosod, os hoffech\n"
-"chi, yn yr achos hwnnw bydd yn cymryd drosodd y\n"
-"disg caled!!\n"
-"(mae hyn ar gyfer gosod ar flwch arall).\n"
-"\n"
-"Efallai byddai'n well gennych ai osod y gosodiad.\n"
-
-#: steps_interactive.pm:1158
-#, c-format
-msgid "Replay"
-msgstr "Ail chwarae"
-
-#: steps_interactive.pm:1158
-#, c-format
-msgid "Automated"
-msgstr "Awtomeiddwyd"
-
-#: steps_interactive.pm:1161
-#, c-format
-msgid "Save packages selection"
-msgstr "Cadw'r dewis o becynnau"
-
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
 #, c-format
@@ -1576,30 +1545,43 @@ msgid ""
 "Exit"
 msgstr "Gorffen"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Eich bwrdd gwaith ar allwedd USB"
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Nid yw diweddaru o ddosbarthiad 32did i 64did yn cael ei gynnal"
 
-#: ../../advertising/IM_free08S.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Mandriva Linux - y dosbarthiad cod agored 100%%"
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Nid yw diweddaru o ddosbarthiad 64did i 32did yn cael ei gynnal"
 
-#: ../../advertising/IM_one08S.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Arbrofi rhwydd gyda Mandriva One"
+#~ msgid "Contacting the mirror to get the list of available packages..."
+#~ msgstr "Cysylltu â'r drych i estyn y rhestr o becynnau sydd ar gael..."
 
-#: ../../advertising/IM_pwp08S.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Bwrdd gwaith Mandriva Linux llawn, gyda chefnogaeth"
+#~ msgid "Unable to contact mirror %s"
+#~ msgstr "Methu canfod drych: %s."
 
-#: ../../advertising/IM_range08S.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: dosbarthiad ar gyfer angen pawb"
+#~ msgid "Generate auto install floppy"
+#~ msgstr "Creu disg meddal awto gosod"
+
+#~ msgid ""
+#~ "The auto install can be fully automated if wanted,\n"
+#~ "in that case it will take over the hard drive!!\n"
+#~ "(this is meant for installing on another box).\n"
+#~ "\n"
+#~ "You may prefer to replay the installation.\n"
+#~ msgstr ""
+#~ "Mae modd awtomeiddio'r awto gosod, os hoffech\n"
+#~ "chi, yn yr achos hwnnw bydd yn cymryd drosodd y\n"
+#~ "disg caled!!\n"
+#~ "(mae hyn ar gyfer gosod ar flwch arall).\n"
+#~ "\n"
+#~ "Efallai byddai'n well gennych ai osod y gosodiad.\n"
+
+#~ msgid "Replay"
+#~ msgstr "Ail chwarae"
+
+#~ msgid "Automated"
+#~ msgstr "Awtomeiddwyd"
+
+#~ msgid "Save packages selection"
+#~ msgstr "Cadw'r dewis o becynnau"
 
 #~ msgid "Do you want to use aboot?"
 #~ msgstr "Ydych chi eisiau defnyddio aboot?"