diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 7e3b238e3b..962b38503e 100644
Binary files a/django/conf/locale/cy/LC_MESSAGES/django.mo and b/django/conf/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index ba573284b7..7cee0e500b 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@@ -18,74 +18,71 @@ msgstr ""
 
 #: contrib/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
-#, fuzzy
 msgid "object ID"
-msgstr "id gwrthrych"
+msgstr "ID gwrthrych"
 
 #: contrib/comments/models/comments.py:9
 msgid "headline"
-msgstr ""
+msgstr "pennawd"
 
 #: contrib/comments/models/comments.py:10
 #: contrib/comments/models/comments.py:162
-#, fuzzy
 msgid "comment"
-msgstr "cynnwys"
+msgstr "sylw"
 
 #: contrib/comments/models/comments.py:11
 msgid "rating #1"
-msgstr ""
+msgstr "cyfraddiad #1"
 
 #: contrib/comments/models/comments.py:12
 msgid "rating #2"
-msgstr ""
+msgstr "cyfraddiad #2"
 
 #: contrib/comments/models/comments.py:13
 msgid "rating #3"
-msgstr ""
+msgstr "cyfraddiad #3"
 
 #: contrib/comments/models/comments.py:14
 msgid "rating #4"
-msgstr ""
+msgstr "cyfraddiad #4"
 
 #: contrib/comments/models/comments.py:15
 msgid "rating #5"
-msgstr ""
+msgstr "cyfraddiad #5"
 
 #: contrib/comments/models/comments.py:16
 msgid "rating #6"
-msgstr ""
+msgstr "cyfraddiad #6"
 
 #: contrib/comments/models/comments.py:17
 msgid "rating #7"
-msgstr ""
+msgstr "cyfraddiad #7"
 
 #: contrib/comments/models/comments.py:18
 msgid "rating #8"
-msgstr ""
+msgstr "cyfraddiad #8"
 
 #: contrib/comments/models/comments.py:23
 msgid "is valid rating"
-msgstr ""
+msgstr "yn gyfraddiad dilys"
 
 #: contrib/comments/models/comments.py:24
 #: contrib/comments/models/comments.py:164
 msgid "date/time submitted"
-msgstr ""
+msgstr "dyddiad/amser wedi ymostwng"
 
 #: contrib/comments/models/comments.py:25
 #: contrib/comments/models/comments.py:165
 msgid "is public"
-msgstr ""
+msgstr "yn gyhoeddus"
 
 #: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
-#, fuzzy
 msgid "IP address"
-msgstr "cyfeiriad e-bost"
+msgstr "cyfeiriad IP"
 
 #: contrib/comments/models/comments.py:27
 msgid "is removed"
-msgstr ""
+msgstr "wedi diddymu"
 
 #: contrib/comments/models/comments.py:27
 msgid ""
@@ -95,18 +92,16 @@ msgstr ""
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
-msgstr ""
+msgstr "Sylw"
 
 #: contrib/comments/models/comments.py:32
-#, fuzzy
 msgid "Comments"
-msgstr "galluogi sylwadau"
+msgstr "Sylwadau"
 
 #: contrib/comments/models/comments.py:85
 #: contrib/comments/models/comments.py:204
-#, fuzzy
 msgid "Content object"
-msgstr "math cynnwys"
+msgstr "Gwrthrych cynnwys"
 
 #: contrib/comments/models/comments.py:113
 #, python-format
@@ -117,72 +112,69 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
+"Postiwyd gan %(user)s ar %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 
 #: contrib/comments/models/comments.py:163
-#, fuzzy
 msgid "person's name"
-msgstr "enw cyntaf"
+msgstr "enw'r person"
 
 #: contrib/comments/models/comments.py:166
-#, fuzzy
 msgid "ip address"
-msgstr "cyfeiriad e-bost"
+msgstr "cyfeiriad ip"
 
 #: contrib/comments/models/comments.py:168
 msgid "approved by staff"
 msgstr ""
 
 #: contrib/comments/models/comments.py:172
-#, fuzzy
 msgid "Free comment"
-msgstr "galluogi sylwadau"
+msgstr "Sylw rhydd"
 
 #: contrib/comments/models/comments.py:173
-#, fuzzy
 msgid "Free comments"
-msgstr "galluogi sylwadau"
+msgstr "Sylwadau rhydd"
 
 #: contrib/comments/models/comments.py:209
 msgid "score"
-msgstr ""
+msgstr "sgôr"
 
 #: contrib/comments/models/comments.py:210
-#, fuzzy
 msgid "score date"
-msgstr "dyddiad darfod"
+msgstr "dyddiad sgôr"
 
 #: contrib/comments/models/comments.py:213
 msgid "Karma score"
-msgstr ""
+msgstr "Sgôr Carma"
 
 #: contrib/comments/models/comments.py:214
 msgid "Karma scores"
-msgstr ""
+msgstr "Sgorau Carma"
 
 #: contrib/comments/models/comments.py:223
 #, python-format
 msgid "%(score)d rating by %(user)s"
-msgstr ""
+msgstr "%(score)d"
 
 #: contrib/comments/models/comments.py:248
-#, fuzzy
 msgid "flag date"
-msgstr "tudalen fflat"
+msgstr "fflagio dyddiad"
 
 #: contrib/comments/models/comments.py:251
-#, fuzzy
 msgid "User flag"
-msgstr "Defnyddiwr"
+msgstr "Fflag defnyddiwr"
 
 #: contrib/comments/models/comments.py:252
-#, fuzzy
 msgid "User flags"
-msgstr "Defnyddwyr"
+msgstr "Fflagiau defnyddwyr"
 
 #: contrib/comments/models/comments.py:256
 #, python-format
 msgid "Flag by %r"
-msgstr ""
+msgstr "Fflagio hefo %r"
 
 #: contrib/comments/models/comments.py:271
 #, python-format
@@ -193,35 +185,33 @@ msgid ""
 msgstr ""
 
 #: contrib/comments/models/comments.py:278
-#, fuzzy
 msgid "deletion date"
-msgstr "data sesiwn"
+msgstr "dyddiad dilead"
 
 #: contrib/comments/models/comments.py:281
 msgid "Moderator deletion"
-msgstr ""
+msgstr "Dilead cymedrolwr"
 
 #: contrib/comments/models/comments.py:282
 msgid "Moderator deletions"
-msgstr ""
+msgstr "Dileadau cymedrolwr"
 
 #: contrib/comments/models/comments.py:286
 #, python-format
 msgid "Moderator deletion by %r"
-msgstr ""
+msgstr "Dilead cymedrolwr gan %r"
 
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
-msgstr ""
+msgstr "Ni gellir defnyddwyr dienw pleidleisio"
 
 #: contrib/comments/views/karma.py:22
-#, fuzzy
 msgid "Invalid comment ID"
-msgstr "galluogi sylwadau"
+msgstr "ID sylw annilys"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
-msgstr ""
+msgstr "Dim pleidleisio ar gyfer eich hun"
 
 #: contrib/comments/views/comments.py:25
 msgid ""
@@ -254,7 +244,7 @@ msgstr ""
 #: contrib/comments/views/comments.py:186
 #: contrib/comments/views/comments.py:277
 msgid "Only POSTs are allowed"
-msgstr ""
+msgstr "Caniateir POSTiau yn unig"
 
 #: contrib/comments/views/comments.py:190
 #: contrib/comments/views/comments.py:281
@@ -292,33 +282,31 @@ msgstr ""
 
 #: contrib/admin/filterspecs.py:109
 msgid "Any date"
-msgstr ""
+msgstr "Unrhyw dyddiad"
 
 #: contrib/admin/filterspecs.py:110
-#, fuzzy
 msgid "Today"
-msgstr "Dydd Llun"
+msgstr "Heddiw"
 
 #: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
-msgstr ""
+msgstr "7 diwrnod gorffennol"
 
 #: contrib/admin/filterspecs.py:115
 msgid "This month"
-msgstr ""
+msgstr "Mis yma"
 
 #: contrib/admin/filterspecs.py:117
 msgid "This year"
-msgstr ""
+msgstr "Blwyddyn yma"
 
 #: contrib/admin/filterspecs.py:143
 msgid "Yes"
-msgstr ""
+msgstr "Ie"
 
 #: contrib/admin/filterspecs.py:143
-#, fuzzy
 msgid "No"
-msgstr "Tach."
+msgstr "Na"
 
 #: contrib/admin/filterspecs.py:150
 msgid "Unknown"
@@ -354,7 +342,7 @@ msgstr "cofnodion"
 
 #: contrib/admin/templatetags/admin_list.py:245
 msgid "All dates"
-msgstr ""
+msgstr "Dyddiadau i gyd"
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -383,19 +371,18 @@ msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
 #: contrib/admin/views/main.py:49
-#, fuzzy
 msgid "Site administration"
-msgstr "Gweinyddiad Django"
+msgstr "Gweinyddiad safle"
 
 #: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
-msgstr ""
+msgstr "Dewis %s"
 
 #: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
-msgstr ""
+msgstr "Dewis %s i newid"
 
 #: contrib/admin/views/main.py:407
 #, python-format
@@ -412,29 +399,29 @@ msgid "You may add another %s below."
 msgstr ""
 
 #: contrib/admin/views/main.py:437
-#, fuzzy, python-format
+#, python-format
 msgid "Add %s"
-msgstr "Ychwanegu"
+msgstr "Ychwanegu %s"
 
 #: contrib/admin/views/main.py:453
 #, python-format
 msgid "Added %s."
-msgstr ""
+msgstr "Ychwanegwyd %s."
 
 #: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
 #: contrib/admin/views/main.py:457
 msgid "and"
-msgstr ""
+msgstr "ac"
 
 #: contrib/admin/views/main.py:455
-#, fuzzy, python-format
+#, python-format
 msgid "Changed %s."
-msgstr "Newidio"
+msgstr "Newidiwyd %s."
 
 #: contrib/admin/views/main.py:457
 #, python-format
 msgid "Deleted %s."
-msgstr ""
+msgstr "Dileuwyd %s."
 
 #: contrib/admin/views/main.py:460
 msgid "No fields changed."
@@ -452,9 +439,9 @@ msgid ""
 msgstr ""
 
 #: contrib/admin/views/main.py:532
-#, fuzzy, python-format
+#, python-format
 msgid "Change %s"
-msgstr "Newidio"
+msgstr "Newidio %s"
 
 #: contrib/admin/views/main.py:610
 #, python-format
@@ -473,12 +460,12 @@ msgstr ""
 
 #: contrib/admin/views/main.py:647
 msgid "Are you sure?"
-msgstr ""
+msgstr "Ydych yn sicr?"
 
 #: contrib/admin/views/main.py:662
-#, fuzzy, python-format
+#, python-format
 msgid "Change history: %s"
-msgstr "Newid cyfrinair"
+msgstr "Hanes newid: %s"
 
 #: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
 #: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
@@ -500,53 +487,48 @@ msgid "Comma-separated integers"
 msgstr ""
 
 #: contrib/admin/views/doc.py:248
-#, fuzzy
 msgid "Date (without time)"
-msgstr "amser gweithred"
+msgstr "Dyddiad (heb amser)"
 
 #: contrib/admin/views/doc.py:249
-#, fuzzy
 msgid "Date (with time)"
-msgstr "Dyddiad/amser"
+msgstr "Dyddiad (gyda amser)"
 
 #: contrib/admin/views/doc.py:250
-#, fuzzy
 msgid "E-mail address"
-msgstr "Cyfeiriad e-bost:"
+msgstr "Cyfeiriad e-bost"
 
 #: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
 msgid "File path"
-msgstr ""
+msgstr "Llwybr ffeil"
 
 #: contrib/admin/views/doc.py:252
-#, fuzzy
 msgid "Decimal number"
-msgstr "Rhagfyr"
+msgstr "Rhif degol"
 
 #: contrib/admin/views/doc.py:258
 msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Boole (Naill ai True, False neu None)"
 
 #: contrib/admin/views/doc.py:259
 msgid "Relation to parent model"
-msgstr ""
+msgstr "Perthynas i model rhiant"
 
 #: contrib/admin/views/doc.py:260
-#, fuzzy
 msgid "Phone number"
-msgstr "Rhowch rhif cyfan."
+msgstr "Rhif ffôn"
 
 #: contrib/admin/views/doc.py:263
 msgid "String (up to 50)"
-msgstr ""
+msgstr "Llinyn (i fyny at 50)"
 
 #: contrib/admin/views/doc.py:265
 msgid "Text"
-msgstr ""
+msgstr "Testun"
 
 #: contrib/admin/views/doc.py:266
 msgid "Time"
-msgstr ""
+msgstr "Amser"
 
 #: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
@@ -554,11 +536,11 @@ msgstr "URL"
 
 #: contrib/admin/views/doc.py:268
 msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr "Talaith U.D. (dwy briflythyren)"
 
 #: contrib/admin/views/doc.py:269
 msgid "XML text"
-msgstr ""
+msgstr "Testun XML"
 
 #: contrib/admin/templates/admin/object_history.html:3
 #: contrib/admin/templates/admin/change_list.html:4
@@ -702,9 +684,9 @@ msgid "None available"
 msgstr "Dim ar gael"
 
 #: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
+#, python-format
 msgid "Add %(name)s"
-msgstr "Ychwanegu"
+msgstr "Ychwanegu %(name)s"
 
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
@@ -748,15 +730,15 @@ msgstr "Yndw, rwy'n sicr"
 #: contrib/admin/templates/admin/filter.html:2
 #, python-format
 msgid " By %(title)s "
-msgstr ""
+msgstr " Gan %(title)s"
 
 #: contrib/admin/templates/admin/search_form.html:7
 msgid "Go"
-msgstr ""
+msgstr "Ewch"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
-msgstr ""
+msgstr "Gweld ar safle"
 
 #: contrib/admin/templates/admin/change_form.html:28
 msgid "Please correct the error below."
@@ -766,32 +748,31 @@ msgstr[1] ""
 
 #: contrib/admin/templates/admin/change_form.html:45
 msgid "Ordering"
-msgstr ""
+msgstr "Trefnu"
 
 #: contrib/admin/templates/admin/change_form.html:48
 msgid "Order:"
-msgstr ""
+msgstr "Trefn:"
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
-msgstr ""
+msgstr "Dileu"
 
 #: contrib/admin/templates/admin/submit_line.html:4
 msgid "Save as new"
-msgstr ""
+msgstr "Cadw fel newydd"
 
 #: contrib/admin/templates/admin/submit_line.html:5
 msgid "Save and add another"
-msgstr ""
+msgstr "Cadw ac ychwanegu un arall"
 
 #: contrib/admin/templates/admin/submit_line.html:6
 msgid "Save and continue editing"
-msgstr ""
+msgstr "Cadw ac parhau i olygu"
 
 #: contrib/admin/templates/admin/submit_line.html:7
-#, fuzzy
 msgid "Save"
-msgstr "gweithredol"
+msgstr "Cadw"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -908,15 +889,15 @@ msgstr "Y tîm %(site_name)s"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
-msgstr ""
+msgstr "Dogfennaeth"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Bookmarklets"
-msgstr ""
+msgstr "Dalennau gofnod"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:5
 msgid "Documentation bookmarklets"
-msgstr ""
+msgstr "Dogfennaeth dalennau gofnod"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:9
 msgid ""
@@ -931,7 +912,7 @@ msgstr ""
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:19
 msgid "Documentation for this page"
-msgstr ""
+msgstr "Dogfennaeth er mwyn y dudalen yma"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:20
 msgid ""
@@ -940,39 +921,42 @@ msgid ""
 msgstr ""
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:22
-#, fuzzy
 msgid "Show object ID"
-msgstr "id gwrthrych"
+msgstr "Dangos ID gwrthrych"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:23
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
+"Yn dangos y fath-cynnwys a'r ID unigryw ar gyfer tudalennau sy'n cynrychioli"
+"gwrthrych sengl."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Edit this object (current window)"
-msgstr ""
+msgstr "Golygu'r gwrthrych yma (ffenestr cyfoes)"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:26
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
+"Yn neidio i'r dudalen weinyddiad ar gyfer tudalennau sy'n cynrychioli "
+"gwrthrych sengl."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:28
 msgid "Edit this object (new window)"
-msgstr ""
+msgstr "Golygu'r gwrthrych yma (ffenestr newydd)"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:29
 msgid "As above, but opens the admin page in a new window."
-msgstr ""
+msgstr "Fel uwchben, ond yn agor y dudalen weinyddiad mewn ffenestr newydd."
 
 #: contrib/admin/templates/widget/date_time.html:3
 msgid "Date:"
-msgstr ""
+msgstr "Dyddiad:"
 
 #: contrib/admin/templates/widget/date_time.html:4
 msgid "Time:"
-msgstr ""
+msgstr "Amser:"
 
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
@@ -1030,13 +1014,12 @@ msgid "template name"
 msgstr "enw'r templed"
 
 #: contrib/flatpages/models/flatpages.py:12
-#, fuzzy
 msgid ""
 "Example: 'flatpages/contact_page'. If this isn't provided, the system will "
 "use 'flatpages/default'."
 msgstr ""
-"Er enghraifft: 'flatfiles/tudalen_cyswllt'. Os nid darparwyd, ddefnyddia'r "
-"system 'flatfiles/default'."
+"Er enghraifft: 'flatpages/tudalen_cyswllt'. Os nid darparwyd, ddefnyddia'r "
+"system 'flatpages/default'."
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "registration required"
@@ -1175,34 +1158,32 @@ msgstr "Rhag."
 #: utils/timesince.py:12
 msgid "year"
 msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "blwyddyn"
+msgstr[1] "blynyddoedd"
 
 #: utils/timesince.py:13
 msgid "month"
 msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "mis"
+msgstr[1] "misoedd"
 
 #: utils/timesince.py:14
-#, fuzzy
 msgid "day"
 msgid_plural "days"
-msgstr[0] "Mai"
-msgstr[1] "Mai"
+msgstr[0] "diwrnod"
+msgstr[1] "diwrnodau"
 
 #: utils/timesince.py:15
 msgid "hour"
 msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "awr"
+msgstr[1] "oriau"
 
 #: utils/timesince.py:16
-#, fuzzy
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "safle"
-msgstr[1] "safle"
+msgstr[0] "munud"
+msgstr[1] "munudau"
 
 #: models/core.py:7
 msgid "domain name"
@@ -1310,7 +1291,7 @@ msgstr "cyfrinair"
 
 #: models/auth.py:37
 msgid "Use '[algo]$[salt]$[hexdigest]'"
-msgstr ""
+msgstr "Defnyddiwch '[algo]$[salt]$[hexdigest]'"
 
 #: models/auth.py:38
 msgid "staff status"
@@ -1362,7 +1343,7 @@ msgstr "Neges"
 
 #: conf/global_settings.py:37
 msgid "Bengali"
-msgstr ""
+msgstr "Bengaleg"
 
 #: conf/global_settings.py:38
 msgid "Czech"
@@ -1373,9 +1354,8 @@ msgid "Welsh"
 msgstr "Cymraeg"
 
 #: conf/global_settings.py:40
-#, fuzzy
 msgid "Danish"
-msgstr "Spaeneg"
+msgstr "Daneg"
 
 #: conf/global_settings.py:41
 msgid "German"
@@ -1399,7 +1379,7 @@ msgstr "Galisieg"
 
 #: conf/global_settings.py:46
 msgid "Icelandic"
-msgstr ""
+msgstr "Islandeg"
 
 #: conf/global_settings.py:47
 msgid "Italian"
@@ -1415,7 +1395,7 @@ msgstr "Brasileg"
 
 #: conf/global_settings.py:50
 msgid "Romanian"
-msgstr ""
+msgstr "Romaneg"
 
 #: conf/global_settings.py:51
 msgid "Russian"
@@ -1423,7 +1403,7 @@ msgstr "Rwsieg"
 
 #: conf/global_settings.py:52
 msgid "Slovak"
-msgstr ""
+msgstr "Slofaceg"
 
 #: conf/global_settings.py:53
 msgid "Serbian"
@@ -1431,7 +1411,7 @@ msgstr "Serbeg"
 
 #: conf/global_settings.py:54
 msgid "Swedish"
-msgstr ""
+msgstr "Swedeg"
 
 #: conf/global_settings.py:55
 msgid "Simplified Chinese"
@@ -1439,9 +1419,8 @@ msgstr "Tsieinëeg Symledig"
 
 #: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
 #: core/meta/fields.py:499
-#, fuzzy
 msgid "This field is required."
-msgstr "Mae'r faes yma yn annilydd."
+msgstr "Mae angen y faes yma."
 
 #: core/formfields.py:336
 #, python-format
@@ -1451,40 +1430,35 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: core/formfields.py:341
-#, fuzzy
 msgid "Line breaks are not allowed here."
-msgstr "Ni chaniateir lythrennau bach yma."
+msgstr "Ni chaniateir toriadau llinell yma."
 
 #: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr ""
+msgstr "Dewisiwch dewis dilys; dydy '%(data)s' dim mewn %(choices)s."
 
 #: core/formfields.py:601
 msgid "The submitted file is empty."
-msgstr ""
+msgstr "Mae'r ffeil yn wag."
 
 #: core/formfields.py:655
-#, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Rhowch rhif cyfan."
+msgstr "Rhowch rhif cyfan rhwng -32,768 a 32,767."
 
 #: core/formfields.py:664
-#, fuzzy
 msgid "Enter a positive number."
-msgstr "Rhowch rhif cyfan."
+msgstr "Rhowch rhif positif."
 
 #: core/formfields.py:673
-#, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
-msgstr "Rhowch rhif cyfan."
+msgstr "Rhowch rhif cyfan rhwng 0 a 32,767."
 
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Rhaid i'r werth yma cynnwys lythrennau, rhifau ac tanlinellau yn unig."
 
 #: core/validators.py:66
-#, fuzzy
 msgid "This value must contain only letters, numbers, underscores and slashes."
 msgstr ""
 "Rhaid i'r werth yma cynnwys lythrennau, rhifau, tanlinellau ac slaesau yn "
@@ -1747,9 +1721,9 @@ msgstr ""
 "yn ddechrau â \"%(start)s\".)"
 
 #: core/meta/fields.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "Please enter a valid %s."
-msgstr "Rhowch cyfeiriad IP dilys, os gwelwch yn dda."
+msgstr "Rhowch %s dilys, os gwelwch yn dda."
 
 #: core/meta/fields.py:60
 #, python-format
@@ -1767,9 +1741,8 @@ msgstr ""
 "Gafaelwch lawr \"Control\", neu \"Command\" ar Fac, i ddewis mwy nag un."
 
 #: core/meta/fields.py:508
-#, fuzzy
 msgid "Enter a valid filename."
-msgstr "Rhowch cyfeiriad e-bost ddilys."
+msgstr "Rhowch enw ffeil dilys."
 
 #: core/meta/fields.py:777
 #, python-format
@@ -1781,7 +1754,7 @@ msgstr[1] ""
 
 #: core/template/defaultfilters.py:354
 msgid "yes,no,maybe"
-msgstr ""
+msgstr "ie,na,efallai"
 
 #, fuzzy
 #~ msgid "count"
diff --git a/django/conf/locale/cy/LC_MESSAGES/djangojs.mo b/django/conf/locale/cy/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..1e9c7db9d1
Binary files /dev/null and b/django/conf/locale/cy/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/cy/LC_MESSAGES/djangojs.po b/django/conf/locale/cy/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..7720f9faec
--- /dev/null
+++ b/django/conf/locale/cy/LC_MESSAGES/djangojs.po
@@ -0,0 +1,74 @@
+# Translation of Django admin JS to Welsh.
+# Copyright (C) 2005 Django project
+# This file is distributed under the same license as the Django package.
+# Jason Davies <jason@jasondavies.com>, 2005.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-04 16:46+0000\n"
+"PO-Revision-Date: 2005-12-04 16:53+0000\n"
+"Last-Translator: Jason Davies <jason@jasondavies.com>\n"
+"Language-Team: Cymraeg <cy@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/admin/media/js/calendar.js:24
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr "Ionawr Chwefror Mawrth Ebrill Mai Mehefin Gorffennaf Medi Hydref Tachwedd Rhagfyr"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "S Ll M M I G S"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+msgid "Now"
+msgstr "Nawr"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+msgid "Clock"
+msgstr "Cloc"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+msgid "Choose a time"
+msgstr "Dewis amser"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Midnight"
+msgstr "Hanner nos"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "6 a.m."
+msgstr "6 y.b."
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "Noon"
+msgstr "Hanner dydd"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+msgid "Cancel"
+msgstr "Diddymu"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+msgid "Today"
+msgstr "Heddiw"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+msgid "Calendar"
+msgstr "Calendr"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+msgid "Yesterday"
+msgstr "Ddoe"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+msgid "Tomorrow"
+msgstr "Yfory"