sync with code and merge strings from mcc & drakxtools

1 files changed, 29 insertions, 9 deletions

diff --git a/po/cy.po b/po/cy.po
index 2733e13..d219417 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-17 16:58+0100\n"
+"POT-Creation-Date: 2007-03-13 13:35+0000\n"
 "PO-Revision-Date: 2006-03-18 21:24-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -153,7 +153,13 @@ msgstr "Defnyddwyr"
 msgid "Groups"
 msgstr "Grwpiau"
 
-#: ../userdrake:154
+#. -PO: do not translate, this is already translated in mcc
+#: ../userdrake:142
+#, c-format
+msgid "Users and groups"
+msgstr "Defnyddwyr a grwpiau"
+
+#: ../userdrake:157
 #, c-format
 msgid "User Name"
 msgstr "Enw Defnyddiwr"
@@ -618,17 +624,28 @@ msgstr "Nid oes modd tynnu defnyddiwr '%s; o'u grŵp cynradd"
 msgid "Close"
 msgstr "Cau"
 
-#: ../userdrake:1025
+#: ../userdrake:1033
 #, c-format
-msgid "Authors: "
-msgstr "Awduron:"
+msgid "Copyright (C) %s by Mandriva"
+msgstr "Hawlfraint (C) %s  Mandriva"
 
-#: ../userdrake:1031
-#, c-format
-msgid "Users Management \n"
+#: ../userdrake:1036
+#, fuzzy, c-format
+msgid "Users Management."
 msgstr "Rheoli Defnyddwyr\n"
 
-#: ../userdrake:1037
+#: ../userdrake:1038
+#, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../userdrake:1044
+#, c-format
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr "Rhoslyn Prys <post@meddal.com>\n"
+
+#: ../userdrake:1051
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Mae'r maes enw'n wag cynigwch enw"
@@ -649,3 +666,6 @@ msgstr "Mae'r enw'n rhy hir"
 #, c-format
 msgid "Error"
 msgstr "Gwall"
+
+#~ msgid "Authors: "
+#~ msgstr "Awduron:"