Synthesized commit during git-svn import combining previous Mandriva history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r433 | dmorgan | 2011-02-06 02:16:32 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned control-center
------------------------------------------------------------------------

1 files changed, 20 insertions, 11 deletions

diff --git a/po/cy.po b/po/cy.po
index d587c1f2..72c20a80 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-cy\n"
-"POT-Creation-Date: 2010-05-26 17:42+0200\n"
+"POT-Creation-Date: 2011-02-06 01:19+0100\n"
 "PO-Revision-Date: 2009-08-24 19:15-0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -539,8 +540,8 @@ msgstr ""
 
 #: ../control-center:90
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr ""
 
 #: ../control-center:100 ../control-center:105
 #, c-format
@@ -1161,8 +1162,8 @@ msgstr "<post@meddal.com>"
 msgid "Translator: "
 msgstr "Cyfieithydd"
 
-#. -PO: Here, first %s will be replaced by 'Mandriva Linux'
-#. -PO: second %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
+#. -PO: Here, first %s will be replaced by 'Mageia'
+#. -PO: second %s will be replaced by the version (eg: "Mageia 1 (Free) Control Center")
 #: ../control-center:1483
 #, c-format
 msgid "%s %s (%s) Control Center"
@@ -1174,14 +1175,19 @@ msgstr "Canolfan Rheoli %s %s (%s)"
 msgid "Copyright (C) %s Mandriva SA"
 msgstr "Hawlfraint (C) %s Mandriva SA"
 
+#: ../control-center:1488
+#, fuzzy, c-format
+msgid "Copyright (C) %s Mageia"
+msgstr "Hawlfraint (C) %s Mandriva SA"
+
 #: ../control-center:1494
 #, c-format
 msgid "Authors"
 msgstr "Awdur"
 
 #: ../control-center:1495
-#, c-format
-msgid "Mandriva Linux Contributors"
+#, fuzzy, c-format
+msgid "Mageia Contributors"
 msgstr "Cyfraniadau Mandriva Linux"
 
 #: ../drakconsole:27
@@ -1478,14 +1484,14 @@ msgid "Manage installed software packages on a group of computers"
 msgstr "Rheoli pecynnau meddalwedd wedi eu gosod ar grŵp o gyfrifiaduron"
 
 #: ../lib/MDV/Control_Center.pm:349
-#, c-format
-msgid "Configure authentication for Mandriva tools"
+#, fuzzy, c-format
+msgid "Configure authentication for Mageia tools"
 msgstr "Ffurfweddu dilysu ar gyfer offer Mandriva"
 
 #: ../lib/MDV/Control_Center.pm:350
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Define authentication required to access individual Mandriva configuration "
+"Define authentication required to access individual Mageia configuration "
 "tools "
 msgstr ""
 "Mae angen diffinio'r dilysu er mwyn cael mynediad at offer ffurfweddu unigol "
@@ -1925,6 +1931,9 @@ msgstr "Cydraniad Sgrin"
 msgid "Configure Your Computer"
 msgstr "Ffurfweddu eich Cyfrifiadur"
 
+#~ msgid "Mandriva Linux"
+#~ msgstr "Mandriva Linux"
+
 #~ msgid "Set up security level and audit"
 #~ msgstr "Gosod lefel diogelwch y system ac awdit"