sync with code

1 files changed, 29 insertions, 35 deletions

diff --git a/perl-install/install/share/po/cy.po b/perl-install/install/share/po/cy.po
index 39f400dac..cd845bf7a 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: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2011-05-19 02:52+0200\n"
 "PO-Revision-Date: 2009-10-01 16:09+0100\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Meddal.com\n"
@@ -21,30 +21,11 @@ msgstr ""
 "X-Poedit-Country: UNITED KINGDOM\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1 ../../advertising/02_IM_mageia.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Eich bwrdd gwaith ar allwedd USB"
-
-#: ../../advertising/IM_free.pl:1
-#, c-format
-msgid "The 100%% open source Mageia distribution"
-msgstr "Mageia - y dosbarthiad cod agored 100%%"
-
-#: ../../advertising/IM_one.pl:1
-#, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Arbrofi rhwydd gyda Mageia One"
-
-#: ../../advertising/IM_pwp.pl:1
-#, c-format
-msgid "A full Mageia desktop, with support"
-msgstr "Bwrdd gwaith Mageia llawn, gyda chefnogaeth"
-
-#: ../../advertising/IM_range.pl:1
-#, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: dosbarthiad ar gyfer angen pawb"
+msgid "Mageia, the new Linux distribution"
+msgstr ""
 
 #: any.pm:109
 #, c-format
@@ -98,14 +79,12 @@ msgstr "Rhaid i'r URL gychwyn gyda ftp:// neu http://"
 
 #: any.pm:182
 #, c-format
-msgid ""
-"Contacting %s web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "Cysylltu â safle gwe %s i estyn y rhestr o ddrychau..."
 
 #: any.pm:187
 #, c-format
-msgid ""
-"Failed contacting %s web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr "Methwyd cysylltu â safle gwe %s i estyn y rhestr o ddrychau"
 
 #: any.pm:197
@@ -296,17 +275,17 @@ msgstr "Cau'r rhwydwaith"
 msgid "Please wait, retrieving file"
 msgstr "Arhoswch, estyn ffeil"
 
-#: media.pm:717
+#: media.pm:715
 #, c-format
 msgid "unable to add medium"
 msgstr "methu ychwanegu cyfrwng"
 
-#: media.pm:757
+#: media.pm:755
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Copïo rhai pecynnau ar ddisg ar gyfer defnydd yn y dyfodol"
 
-#: media.pm:810
+#: media.pm:808
 #, c-format
 msgid "Copying in progress"
 msgstr "Wrthi'n copïo..."
@@ -376,8 +355,8 @@ msgid ""
 "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
 "(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Rhaglenni swyddfa: prosesydd geiriau (LibreOffice Writer, Kword), "
-"taenlenni (LibreOffice Calc, Kspread), ddarllenydd pdf, ag ati"
+"Rhaglenni swyddfa: prosesydd geiriau (LibreOffice Writer, Kword), taenlenni "
+"(LibreOffice Calc, Kspread), ddarllenydd pdf, ag ati"
 
 #: share/meta-task/compssUsers.pl:22
 #, c-format
@@ -1044,9 +1023,9 @@ msgid "Upgrade previous installation (not recommended)"
 msgstr "Diweddaru'r gosodiad blaenorol (argymell i beidio)"
 
 #: steps_interactive.pm:211
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Installer has detected that your installed Mageia system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1563,6 +1542,21 @@ msgid ""
 "Exit"
 msgstr "Gorffen"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Eich bwrdd gwaith ar allwedd USB"
+
+#~ msgid "The 100%% open source Mageia distribution"
+#~ msgstr "Mageia - y dosbarthiad cod agored 100%%"
+
+#~ msgid "Explore Linux easily with Mageia One"
+#~ msgstr "Arbrofi rhwydd gyda Mageia One"
+
+#~ msgid "A full Mageia desktop, with support"
+#~ msgstr "Bwrdd gwaith Mageia llawn, gyda chefnogaeth"
+
+#~ msgid "Mageia: distributions for everybody's needs"
+#~ msgstr "Mageia: dosbarthiad ar gyfer angen pawb"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"