diff --git a/django/bin/make-messages.py b/django/bin/make-messages.py
index 557cb5eeec..34fb68dcfe 100755
--- a/django/bin/make-messages.py
+++ b/django/bin/make-messages.py
@@ -81,7 +81,7 @@ def make_messages():
                     src = pythonize_re.sub('\n#', src)
                     open(os.path.join(dirpath, '%s.py' % file), "wb").write(src)
                     thefile = '%s.py' % file
-                    cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy -o - "%s"' % (
+                    cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy --from-code UTF-8 -o - "%s"' % (
                         os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
                     (stdin, stdout, stderr) = os.popen3(cmd, 'b')
                     msgs = stdout.read()
@@ -103,7 +103,7 @@ def make_messages():
                         open(os.path.join(dirpath, '%s.py' % file), "wb").write(templatize(src))
                         thefile = '%s.py' % file
                     if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
-                    cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy -o - "%s"' % (
+                    cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy --from-code UTF-8 -o - "%s"' % (
                         os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
                     (stdin, stdout, stderr) = os.popen3(cmd, 'b')
                     msgs = stdout.read()
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index a0561e9dbf..91d18e33ce 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:12+0200\n"
+"POT-Creation-Date: 2007-03-12 19:29+1100\n"
 "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
 "Last-Translator: Jason Davies <jason@jasondavies.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -16,1292 +16,273 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/comments/models.py:67 contrib/comments/models.py:166
-msgid "object ID"
-msgstr "ID gwrthrych"
-
-#: contrib/comments/models.py:68
-msgid "headline"
-msgstr "pennawd"
-
-#: contrib/comments/models.py:69 contrib/comments/models.py:90
-#: contrib/comments/models.py:167
-msgid "comment"
-msgstr "sylw"
-
-#: contrib/comments/models.py:70
-msgid "rating #1"
-msgstr "cyfraddiad #1"
-
-#: contrib/comments/models.py:71
-msgid "rating #2"
-msgstr "cyfraddiad #2"
-
-#: contrib/comments/models.py:72
-msgid "rating #3"
-msgstr "cyfraddiad #3"
-
-#: contrib/comments/models.py:73
-msgid "rating #4"
-msgstr "cyfraddiad #4"
-
-#: contrib/comments/models.py:74
-msgid "rating #5"
-msgstr "cyfraddiad #5"
-
-#: contrib/comments/models.py:75
-msgid "rating #6"
-msgstr "cyfraddiad #6"
-
-#: contrib/comments/models.py:76
-msgid "rating #7"
-msgstr "cyfraddiad #7"
-
-#: contrib/comments/models.py:77
-msgid "rating #8"
-msgstr "cyfraddiad #8"
-
-#: contrib/comments/models.py:82
-msgid "is valid rating"
-msgstr "yn gyfraddiad dilys"
-
-#: contrib/comments/models.py:83 contrib/comments/models.py:169
-msgid "date/time submitted"
-msgstr "dyddiad/amser wedi ymostwng"
-
-#: contrib/comments/models.py:84 contrib/comments/models.py:170
-msgid "is public"
-msgstr "yn gyhoeddus"
-
-#: contrib/comments/models.py:85 contrib/admin/views/doc.py:289
-msgid "IP address"
-msgstr "cyfeiriad IP"
-
-#: contrib/comments/models.py:86
-msgid "is removed"
-msgstr "wedi diddymu"
-
-#: contrib/comments/models.py:86
-msgid ""
-"Check this box if the comment is inappropriate. A \"This comment has been "
-"removed\" message will be displayed instead."
-msgstr ""
-
-#: contrib/comments/models.py:91
-#, fuzzy
-msgid "comments"
-msgstr "sylw"
-
-#: contrib/comments/models.py:131 contrib/comments/models.py:207
-msgid "Content object"
-msgstr "Gwrthrych cynnwys"
-
-#: contrib/comments/models.py:159
+#: db/models/manipulators.py:307
 #, python-format
-msgid ""
-"Posted by %(user)s at %(date)s\n"
-"\n"
-"%(comment)s\n"
-"\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.py:168
-msgid "person's name"
-msgstr "enw'r person"
-
-#: contrib/comments/models.py:171
-msgid "ip address"
-msgstr "cyfeiriad ip"
-
-#: contrib/comments/models.py:173
-msgid "approved by staff"
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
 
-#: contrib/comments/models.py:176
-#, fuzzy
-msgid "free comment"
-msgstr "Sylw rhydd"
-
-#: contrib/comments/models.py:177
-#, fuzzy
-msgid "free comments"
-msgstr "Sylwadau rhydd"
-
-#: contrib/comments/models.py:233
-msgid "score"
-msgstr "sgôr"
-
-#: contrib/comments/models.py:234
-msgid "score date"
-msgstr "dyddiad sgôr"
-
-#: contrib/comments/models.py:237
-#, fuzzy
-msgid "karma score"
-msgstr "Sgôr Carma"
-
-#: contrib/comments/models.py:238
-#, fuzzy
-msgid "karma scores"
-msgstr "Sgorau Carma"
-
-#: contrib/comments/models.py:242
-#, python-format
-msgid "%(score)d rating by %(user)s"
-msgstr "%(score)d"
-
-#: contrib/comments/models.py:258
-#, python-format
-msgid ""
-"This comment was flagged by %(user)s:\n"
-"\n"
-"%(text)s"
-msgstr ""
-
-#: contrib/comments/models.py:265
-msgid "flag date"
-msgstr "fflagio dyddiad"
-
-#: contrib/comments/models.py:268
-#, fuzzy
-msgid "user flag"
-msgstr "Fflag defnyddiwr"
-
-#: contrib/comments/models.py:269
-#, fuzzy
-msgid "user flags"
-msgstr "Fflagiau defnyddwyr"
-
-#: contrib/comments/models.py:273
-#, python-format
-msgid "Flag by %r"
-msgstr "Fflagio hefo %r"
-
-#: contrib/comments/models.py:278
-msgid "deletion date"
-msgstr "dyddiad dilead"
-
-#: contrib/comments/models.py:280
-#, fuzzy
-msgid "moderator deletion"
-msgstr "Dilead cymedrolwr"
-
-#: contrib/comments/models.py:281
-#, fuzzy
-msgid "moderator deletions"
-msgstr "Dileadau cymedrolwr"
-
-#: contrib/comments/models.py:285
-#, python-format
-msgid "Moderator deletion by %r"
-msgstr "Dilead cymedrolwr gan %r"
-
-#: contrib/comments/views/karma.py:19
-msgid "Anonymous users cannot vote"
-msgstr "Ni gellir defnyddwyr dienw pleidleisio"
-
-#: contrib/comments/views/karma.py:23
-msgid "Invalid comment ID"
-msgstr "ID sylw annilys"
-
-#: contrib/comments/views/karma.py:25
-msgid "No voting for yourself"
-msgstr "Dim pleidleisio ar gyfer eich hun"
-
-#: contrib/comments/views/comments.py:28
-msgid ""
-"This rating is required because you've entered at least one other rating."
-msgstr ""
-
-#: contrib/comments/views/comments.py:112
-#, python-format
-msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comment:\n"
-"\n"
-"%(text)s"
-msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comments:\n"
-"\n"
-"%(text)s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/comments/views/comments.py:117
-#, python-format
-msgid ""
-"This comment was posted by a sketchy user:\n"
-"\n"
-"%(text)s"
-msgstr ""
-
-#: contrib/comments/views/comments.py:189
-#: contrib/comments/views/comments.py:280
-msgid "Only POSTs are allowed"
-msgstr "Caniateir POSTiau yn unig"
-
-#: contrib/comments/views/comments.py:193
-#: contrib/comments/views/comments.py:284
-msgid "One or more of the required fields wasn't submitted"
-msgstr ""
-
-#: contrib/comments/views/comments.py:197
-#: contrib/comments/views/comments.py:286
-msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
-
-#: contrib/comments/views/comments.py:207
-#: contrib/comments/views/comments.py:292
-msgid ""
-"The comment form had an invalid 'target' parameter -- the object ID was "
-"invalid"
-msgstr ""
-
-#: contrib/comments/views/comments.py:257
-#: contrib/comments/views/comments.py:321
-msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr ""
-
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/login.html:17
-msgid "Username:"
-msgstr "Enw defnyddiwr:"
-
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/admin/templates/admin/login.html:20
-msgid "Password:"
-msgstr "Cyfrinair:"
-
-#: contrib/comments/templates/comments/form.html:6
-#, fuzzy
-msgid "Forgotten your password?"
-msgstr "Newidio fy nghyfrinair"
-
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Log out"
-msgstr "Allgofnodi"
-
-#: contrib/comments/templates/comments/form.html:12
-#, fuzzy
-msgid "Ratings"
-msgstr "cyfraddiad #1"
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-msgstr ""
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-msgstr ""
-
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-msgstr ""
-
-#: contrib/comments/templates/comments/form.html:27
-#: contrib/comments/templates/comments/freeform.html:5
-#, fuzzy
-msgid "Comment:"
-msgstr "Sylw"
-
-#: contrib/comments/templates/comments/form.html:32
-#: contrib/comments/templates/comments/freeform.html:9
-#, fuzzy
-msgid "Preview comment"
-msgstr "Sylw rhydd"
-
-#: contrib/comments/templates/comments/freeform.html:4
-#, fuzzy
-msgid "Your name:"
-msgstr "enw defnyddiwr"
-
-#: contrib/admin/filterspecs.py:40
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143
-msgid "All"
-msgstr ""
-
-#: contrib/admin/filterspecs.py:109
-msgid "Any date"
-msgstr "Unrhyw dyddiad"
-
-#: contrib/admin/filterspecs.py:110
-msgid "Today"
-msgstr "Heddiw"
-
-#: contrib/admin/filterspecs.py:113
-msgid "Past 7 days"
-msgstr "7 diwrnod gorffennol"
-
-#: contrib/admin/filterspecs.py:115
-msgid "This month"
-msgstr "Mis yma"
-
-#: contrib/admin/filterspecs.py:117
-msgid "This year"
-msgstr "Blwyddyn yma"
-
-#: contrib/admin/filterspecs.py:143
-msgid "Yes"
-msgstr "Ie"
-
-#: contrib/admin/filterspecs.py:143
-msgid "No"
-msgstr "Na"
-
-#: contrib/admin/filterspecs.py:150
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/models.py:16
-msgid "action time"
-msgstr "amser gweithred"
-
-#: contrib/admin/models.py:19
-msgid "object id"
-msgstr "id gwrthrych"
-
-#: contrib/admin/models.py:20
-msgid "object repr"
-msgstr "repr gwrthrych"
-
-#: contrib/admin/models.py:21
-msgid "action flag"
-msgstr "fflag gweithred"
-
-#: contrib/admin/models.py:22
-msgid "change message"
-msgstr "neges newid"
-
-#: contrib/admin/models.py:25
-msgid "log entry"
-msgstr "cofnod"
-
-#: contrib/admin/models.py:26
-msgid "log entries"
-msgstr "cofnodion"
-
-#: contrib/admin/templatetags/admin_list.py:228
-msgid "All dates"
-msgstr "Dyddiadau i gyd"
-
-#: contrib/admin/views/decorators.py:9 contrib/auth/forms.py:36
-#: contrib/auth/forms.py:41
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-
-#: contrib/admin/views/decorators.py:23
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "Mewngofnodi"
-
-#: contrib/admin/views/decorators.py:61
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-
-#: contrib/admin/views/decorators.py:68
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-
-#: contrib/admin/views/decorators.py:82
-msgid "Usernames cannot contain the '@' character."
-msgstr ""
-
-#: contrib/admin/views/decorators.py:84
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-
-#: contrib/admin/views/main.py:226
-msgid "Site administration"
-msgstr "Gweinyddiad safle"
-
-#: contrib/admin/views/main.py:260
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:290
-#, python-format
-msgid "Add %s"
-msgstr "Ychwanegu %s"
-
-#: contrib/admin/views/main.py:336
-#, python-format
-msgid "Added %s."
-msgstr "Ychwanegwyd %s."
-
-#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
-#: contrib/admin/views/main.py:340
+#: db/models/manipulators.py:308 contrib/admin/views/main.py:335
+#: contrib/admin/views/main.py:337 contrib/admin/views/main.py:339
 msgid "and"
 msgstr "ac"
 
-#: contrib/admin/views/main.py:338
+#: db/models/fields/related.py:53
 #, python-format
-msgid "Changed %s."
-msgstr "Newidiwyd %s."
+msgid "Please enter a valid %s."
+msgstr "Rhowch %s dilys, os gwelwch yn dda."
 
-#: contrib/admin/views/main.py:340
-#, python-format
-msgid "Deleted %s."
-msgstr "Dileuwyd %s."
+#: db/models/fields/related.py:642
+#, fuzzy
+msgid "Separate multiple IDs with commas."
+msgstr " Gwahanwch mwy nag un ID gyda atalnodau."
 
-#: contrib/admin/views/main.py:343
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:354
-#, python-format
+#: db/models/fields/related.py:644
+#, fuzzy
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
+"Gafaelwch lawr \"Control\", neu \"Command\" ar Fac, i ddewis mwy nag un."
 
-#: contrib/admin/views/main.py:392
+#: db/models/fields/related.py:691
 #, python-format
-msgid "Change %s"
-msgstr "Newidio %s"
-
-#: contrib/admin/views/main.py:470
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr ""
-
-#: contrib/admin/views/main.py:475
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr ""
-
-#: contrib/admin/views/main.py:508
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:511
-msgid "Are you sure?"
-msgstr "Ydych yn sicr?"
-
-#: contrib/admin/views/main.py:533
-#, python-format
-msgid "Change history: %s"
-msgstr "Hanes newid: %s"
-
-#: contrib/admin/views/main.py:565
-#, python-format
-msgid "Select %s"
-msgstr "Dewis %s"
-
-#: contrib/admin/views/main.py:565
-#, python-format
-msgid "Select %s to change"
-msgstr "Dewis %s i newid"
-
-#: contrib/admin/views/doc.py:277 contrib/admin/views/doc.py:286
-#: contrib/admin/views/doc.py:288 contrib/admin/views/doc.py:294
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:297
-msgid "Integer"
-msgstr ""
-
-#: contrib/admin/views/doc.py:278
-msgid "Boolean (Either True or False)"
-msgstr ""
-
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr ""
-
-#: contrib/admin/views/doc.py:280
-msgid "Comma-separated integers"
-msgstr ""
-
-#: contrib/admin/views/doc.py:281
-msgid "Date (without time)"
-msgstr "Dyddiad (heb amser)"
-
-#: contrib/admin/views/doc.py:282
-msgid "Date (with time)"
-msgstr "Dyddiad (gyda amser)"
-
-#: contrib/admin/views/doc.py:283
-msgid "E-mail address"
-msgstr "Cyfeiriad e-bost"
-
-#: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287
-msgid "File path"
-msgstr "Llwybr ffeil"
-
-#: contrib/admin/views/doc.py:285
-msgid "Decimal number"
-msgstr "Rhif degol"
-
-#: contrib/admin/views/doc.py:291
-msgid "Boolean (Either True, False or None)"
-msgstr "Boole (Naill ai True, False neu None)"
-
-#: contrib/admin/views/doc.py:292
-msgid "Relation to parent model"
-msgstr "Perthynas i model rhiant"
-
-#: contrib/admin/views/doc.py:293
-msgid "Phone number"
-msgstr "Rhif ffôn"
-
-#: contrib/admin/views/doc.py:298
-msgid "Text"
-msgstr "Testun"
-
-#: contrib/admin/views/doc.py:299
-msgid "Time"
-msgstr "Amser"
-
-#: contrib/admin/views/doc.py:300 contrib/flatpages/models.py:7
-msgid "URL"
-msgstr "URL"
-
-#: contrib/admin/views/doc.py:301
-msgid "U.S. state (two uppercase letters)"
-msgstr "Talaith U.D. (dwy briflythyren)"
-
-#: contrib/admin/views/doc.py:302
-msgid "XML text"
-msgstr "Testun XML"
-
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Documentation"
-msgstr "Dogfennaeth"
-
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Change password"
-msgstr "Newid cyfrinair"
-
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/base.html:28
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Home"
-msgstr "Adref"
-
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "History"
-msgstr "Hanes"
-
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "Dyddiad/amser"
-
-#: contrib/admin/templates/admin/object_history.html:19
-msgid "User"
-msgstr "Defnyddiwr"
-
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
-msgstr "Gweithred"
-
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "N j, Y, P"
-
-#: contrib/admin/templates/admin/object_history.html:36
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
-msgstr ""
-"Does dim hanes newid gan y gwrthrych yma. Mae'n debyg ni ychwanegwyd drwy'r "
-"safle gweinydd yma."
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Gweinyddiad safle Django"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Gweinyddiad Django"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Gwall gweinyddwr"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Gwall gweinyddwr (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Gwall Gweinyddwr <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Mae gwall wedi digwydd. Adroddwyd i weinyddwyr y safle drwy e-bost ac ddylai "
-"cael ei drwsio cyn bo hir."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Tudalen heb ei ddarganfod"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Mae'n ddrwg gennym, ond nid darganfwyd y dudalen a dymunwyd"
-
-#: contrib/admin/templates/admin/index.html:17
-#, python-format
-msgid "Models available in the %(name)s application."
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:28
-#: contrib/admin/templates/admin/change_form.html:15
-msgid "Add"
-msgstr "Ychwanegu"
-
-#: contrib/admin/templates/admin/index.html:34
-msgid "Change"
-msgstr "Newidio"
-
-#: contrib/admin/templates/admin/index.html:44
-msgid "You don't have permission to edit anything."
-msgstr "Does genych ddim hawl i olygu unrhywbeth."
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "Recent Actions"
-msgstr "Gweithredau Diweddar"
-
-#: contrib/admin/templates/admin/index.html:53
-msgid "My Actions"
-msgstr "Fy Ngweithredau"
-
-#: contrib/admin/templates/admin/index.html:57
-msgid "None available"
-msgstr "Dim ar gael"
-
-#: contrib/admin/templates/admin/change_list.html:11
-#, python-format
-msgid "Add %(name)s"
-msgstr "Ychwanegu %(name)s"
-
-#: contrib/admin/templates/admin/login.html:22
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "Ydych wedi <a href=\"/password_reset/\">anghofio eich cyfrinair</a>?"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Croeso,"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:9
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
-msgstr "Dileu"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
-msgid ""
-"Deleting the %(object_name)s '%(object)s' would result in deleting related "
-"objects, but your account doesn't have permission to delete the following "
-"types of objects:"
-msgstr ""
-"Bydda dileu'r %(object_name)s '%(object)s' yn ddilyn i dileu'r wrthrychau "
-"perthynol, ond ni chaniateir eich cyfrif ddileu'r mathau o wrthrych canlynol:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:21
-#, python-format
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"Ydych yn sicr chi eiso ddileu'r %(object_name)s \"%(object)s\"? Bydd y cwbl "
-"o'r eitemau perthynol canlynol yn cae eu ddileu:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:26
-msgid "Yes, I'm sure"
-msgstr "Yndw, rwy'n sicr"
-
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr " Gan %(title)s"
-
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-msgstr "Ewch"
-
-#: contrib/admin/templates/admin/change_form.html:21
-msgid "View on site"
-msgstr "Gweld ar safle"
-
-#: contrib/admin/templates/admin/change_form.html:30
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Ordering"
-msgstr "Trefnu"
-
-#: contrib/admin/templates/admin/change_form.html:51
-msgid "Order:"
-msgstr "Trefn:"
-
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-msgstr "Cadw fel newydd"
-
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-msgstr "Cadw ac ychwanegu un arall"
-
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-msgstr "Cadw ac parhau i olygu"
-
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
-msgstr "Cadw"
-
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
-msgid "Password change"
-msgstr "Newid cyfrinair"
-
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
-msgid "Password change successful"
-msgstr "Newid cyfrinair yn lwyddianus"
-
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-msgstr "Newidwyd eich cyfrinair."
-
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-#: contrib/admin/templates/registration/password_reset_form.html:10
-#: contrib/admin/templates/registration/password_reset_done.html:4
-msgid "Password reset"
-msgstr "Ailosod cyfrinair"
-
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"Wedi anghofio eich cyfrinair? Rhowch eich cyfeiriad e-bost isod, ac "
-"ailosodan eich cyfrinair ac e-bostio'r un newydd i chi."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Cyfeiriad e-bost:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Ailosodi fy nghyfrinair"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Diolch am dreulio amser ansawdd gyda'r safle we heddiw 'ma."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Ailmewngofnodi"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Ailosod cyfrinair yn lwyddianus"
-
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr "Wedi e-bostio cyfrinair newydd i'r gyfeiriad e-bost "
-
-#: contrib/admin/templates/registration/password_change_form.html:12
-msgid ""
-"Please enter your old password, for security's sake, and then enter your new "
-"password twice so we can verify you typed it in correctly."
-msgstr ""
-"Rhowch eich cyfrinair hen, er mwyn gwarchodaeth, yna rhowch eich cyfrinair "
-"newydd dwywaith er mwyn i ni wirio y teipiwyd yn gywir."
-
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "Cyfrinair hen:"
-
-#: contrib/admin/templates/registration/password_change_form.html:19
-msgid "New password:"
-msgstr "Cyfrinair newydd:"
-
-#: contrib/admin/templates/registration/password_change_form.html:21
-msgid "Confirm password:"
-msgstr "Cadarnhewch cyfrinair:"
-
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
-msgstr "Newidio fy nghyfrinair"
-
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Chi'n derbyn yr e-bost yma achos ddymunwyd ailosod cyfrinair"
-
-#: contrib/admin/templates/registration/password_reset_email.html:3
+#: db/models/fields/__init__.py:42
 #, python-format
-msgid "for your user account at %(site_name)s"
-msgstr "er mwyn eich cyfrif defnyddiwr ar %(site_name)s"
-
-#: contrib/admin/templates/registration/password_reset_email.html:5
-#, python-format
-msgid "Your new password is: %(new_password)s"
-msgstr "Eich cyfrinair newydd yw: %(new_password)s"
-
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-msgstr "Mae croeso i chi newid y gyfrinair hon wrth fynd i'r dudalen yma:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:11
-msgid "Your username, in case you've forgotten:"
-msgstr "Eich enw defnyddiwr, rhag ofn chi wedi anghofio:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
-msgstr "Diolch am ddefnyddio ein safle!"
-
-#: contrib/admin/templates/registration/password_reset_email.html:15
-#, python-format
-msgid "The %(site_name)s team"
-msgstr "Y tîm %(site_name)s"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
-msgstr "Dalennau gofnod"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
-msgid "Documentation bookmarklets"
-msgstr "Dogfennaeth dalennau gofnod"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
-msgid ""
-"\n"
-"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
-"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site.  Note that some of these\n"
-"bookmarklets require you to be viewing the site from a computer designated\n"
-"as \"internal\" (talk to your system administrator if you aren't sure if\n"
-"your computer is \"internal\").</p>\n"
+msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-msgstr "Dogfennaeth er mwyn y dudalen yma"
+#: db/models/fields/__init__.py:116 db/models/fields/__init__.py:273
+#: db/models/fields/__init__.py:609 db/models/fields/__init__.py:620
+#: oldforms/__init__.py:357 newforms/fields.py:78 newforms/fields.py:374
+#: newforms/fields.py:450 newforms/fields.py:461 newforms/models.py:177
+msgid "This field is required."
+msgstr "Mae angen y faes yma."
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid ""
-"Jumps you from any page to the documentation for the view that generates "
-"that page."
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
-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 "
-"cynrychioligwrthrych sengl."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-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 "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 "Fel uwchben, ond yn agor y dudalen weinyddiad mewn ffenestr newydd."
-
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Dyddiad:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Amser:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr ""
-
-#: contrib/admin/templates/widget/file.html:3
+#: db/models/fields/__init__.py:366
 #, fuzzy
-msgid "Change:"
-msgstr "Newidio"
+msgid "This value must be an integer."
+msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
 
-#: contrib/redirects/models.py:7
-msgid "redirect from"
-msgstr "ailgyfeirio o"
-
-#: contrib/redirects/models.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Ddylai hon bod yn lwybr hollol, heb y parth-enw. Er enghraifft: '/"
-"digwyddiadau/chwilio/'."
-
-#: contrib/redirects/models.py:9
-msgid "redirect to"
-msgstr "ailgyfeirio i"
-
-#: contrib/redirects/models.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Gellir fod naill ai llwybr hollol (fel uwch) neu URL hollol yn ddechrau â "
-"'http://'."
-
-#: contrib/redirects/models.py:12
-msgid "redirect"
-msgstr "ailgyfeiriad"
-
-#: contrib/redirects/models.py:13
-msgid "redirects"
-msgstr "ailgyfeiriadau"
-
-#: contrib/flatpages/models.py:8
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Er enghraifft: '/amdan/cyswllt/'. Sicrhewch gennych slaesau arweiniol ac "
-"trywyddiol."
-
-#: contrib/flatpages/models.py:9
-msgid "title"
-msgstr "teitl"
-
-#: contrib/flatpages/models.py:10
-msgid "content"
-msgstr "cynnwys"
-
-#: contrib/flatpages/models.py:11
-msgid "enable comments"
-msgstr "galluogi sylwadau"
-
-#: contrib/flatpages/models.py:12
-msgid "template name"
-msgstr "enw'r templed"
-
-#: contrib/flatpages/models.py:13
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"Er enghraifft: 'flatpages/tudalen_cyswllt'. Os nid darparwyd, ddefnyddia'r "
-"system 'flatpages/default'."
-
-#: contrib/flatpages/models.py:14
-msgid "registration required"
-msgstr "cofrestriad gofynnol"
-
-#: contrib/flatpages/models.py:14
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Os wedi dewis, dim ond defnyddwyr a mewngofnodwyd bydd yn gallu gweld y "
-"tudalen."
-
-#: contrib/flatpages/models.py:18
-msgid "flat page"
-msgstr "tudalen fflat"
-
-#: contrib/flatpages/models.py:19
-msgid "flat pages"
-msgstr "tudalennau fflat"
-
-#: contrib/auth/models.py:13 contrib/auth/models.py:26
-msgid "name"
-msgstr "enw"
-
-#: contrib/auth/models.py:15
-msgid "codename"
-msgstr "enw arwyddol"
-
-#: contrib/auth/models.py:17
+#: db/models/fields/__init__.py:401
 #, fuzzy
-msgid "permission"
-msgstr "Hawl"
+msgid "This value must be either True or False."
+msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
 
-#: contrib/auth/models.py:18 contrib/auth/models.py:27
+#: db/models/fields/__init__.py:422
 #, fuzzy
-msgid "permissions"
-msgstr "Hawliau"
+msgid "This field cannot be null."
+msgstr "Mae'r faes yma yn annilydd."
 
-#: contrib/auth/models.py:29
-#, fuzzy
-msgid "group"
-msgstr "Grŵp"
+#: db/models/fields/__init__.py:456 core/validators.py:148
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Rhowch dyddiad dilys mewn fformat YYYY-MM-DD."
 
-#: contrib/auth/models.py:30 contrib/auth/models.py:65
-#, fuzzy
-msgid "groups"
-msgstr "Grwpiau"
+#: db/models/fields/__init__.py:525 core/validators.py:157
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "Rhowch dyddiad/amser ddilys mewn fformat YYYY-MM-DD HH:MM."
 
-#: contrib/auth/models.py:55
-msgid "username"
-msgstr "enw defnyddiwr"
+#: db/models/fields/__init__.py:629
+msgid "Enter a valid filename."
+msgstr "Rhowch enw ffeil dilys."
 
-#: contrib/auth/models.py:56
-msgid "first name"
-msgstr "enw cyntaf"
-
-#: contrib/auth/models.py:57
-msgid "last name"
-msgstr "enw olaf"
-
-#: contrib/auth/models.py:58
-msgid "e-mail address"
-msgstr "cyfeiriad e-bost"
-
-#: contrib/auth/models.py:59
-msgid "password"
-msgstr "cyfrinair"
-
-#: contrib/auth/models.py:59
-msgid "Use '[algo]$[salt]$[hexdigest]'"
-msgstr "Defnyddiwch '[algo]$[salt]$[hexdigest]'"
-
-#: contrib/auth/models.py:60
-msgid "staff status"
-msgstr "statws staff"
-
-#: contrib/auth/models.py:60
-msgid "Designates whether the user can log into this admin site."
-msgstr "Dylunio ai'r defnyddiwr yn gally mewngofnodi i'r safle weinyddiad yma."
-
-#: contrib/auth/models.py:61
-msgid "active"
-msgstr "gweithredol"
-
-#: contrib/auth/models.py:62
-msgid "superuser status"
-msgstr "statws defnyddiwr swper"
-
-#: contrib/auth/models.py:63
-msgid "last login"
-msgstr "mewngofnod olaf"
-
-#: contrib/auth/models.py:64
-msgid "date joined"
-msgstr "Dyddiad"
-
-#: contrib/auth/models.py:66
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr ""
-"Yn ogystal â'r hawliau trosglwyddwyd dros law, byddai'r defnyddiwr yma hefyd "
-"yn cael y cwbl hawliau a addefwyd i pob grŵp mae o/hi mewn."
-
-#: contrib/auth/models.py:67
-#, fuzzy
-msgid "user permissions"
-msgstr "Hawliau"
-
-#: contrib/auth/models.py:70
-#, fuzzy
-msgid "user"
-msgstr "Defnyddiwr"
-
-#: contrib/auth/models.py:71
-#, fuzzy
-msgid "users"
-msgstr "Defnyddwyr"
-
-#: contrib/auth/models.py:76
-msgid "Personal info"
-msgstr "Gwybodaeth personol"
-
-#: contrib/auth/models.py:77
-msgid "Permissions"
-msgstr "Hawliau"
-
-#: contrib/auth/models.py:78
-msgid "Important dates"
-msgstr "Dyddiadau pwysig"
-
-#: contrib/auth/models.py:79
-msgid "Groups"
-msgstr "Grwpiau"
-
-#: contrib/auth/models.py:219
-#, fuzzy
-msgid "message"
-msgstr "Neges"
-
-#: contrib/auth/forms.py:30
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
+#: conf/global_settings.py:39
+msgid "Arabic"
 msgstr ""
 
-#: contrib/contenttypes/models.py:25
+#: conf/global_settings.py:40
+msgid "Bengali"
+msgstr "Bengaleg"
+
+#: conf/global_settings.py:41
 #, fuzzy
-msgid "python model class name"
-msgstr "enw modwl python"
+msgid "Catalan"
+msgstr "Eidaleg"
 
-#: contrib/contenttypes/models.py:28
-msgid "content type"
-msgstr "math cynnwys"
+#: conf/global_settings.py:42
+msgid "Czech"
+msgstr "Tsieceg"
 
-#: contrib/contenttypes/models.py:29
-msgid "content types"
-msgstr "mathau cynnwys"
+#: conf/global_settings.py:43
+msgid "Welsh"
+msgstr "Cymraeg"
 
-#: contrib/sessions/models.py:35
-msgid "session key"
-msgstr "goriad sesiwn"
+#: conf/global_settings.py:44
+msgid "Danish"
+msgstr "Daneg"
 
-#: contrib/sessions/models.py:36
-msgid "session data"
-msgstr "data sesiwn"
+#: conf/global_settings.py:45
+msgid "German"
+msgstr "Almaeneg"
 
-#: contrib/sessions/models.py:37
-msgid "expire date"
-msgstr "dyddiad darfod"
-
-#: contrib/sessions/models.py:41
-msgid "session"
-msgstr "sesiwn"
-
-#: contrib/sessions/models.py:42
-msgid "sessions"
-msgstr "sesiynau"
-
-#: contrib/sites/models.py:10
-msgid "domain name"
-msgstr "parth-enw"
-
-#: contrib/sites/models.py:11
-msgid "display name"
-msgstr "enw arddangos"
-
-#: contrib/sites/models.py:15
-msgid "site"
-msgstr "safle"
-
-#: contrib/sites/models.py:16
-msgid "sites"
-msgstr "safleoedd"
-
-#: utils/translation.py:360
-msgid "DATE_FORMAT"
+#: conf/global_settings.py:46
+msgid "Greek"
 msgstr ""
 
-#: utils/translation.py:361
-msgid "DATETIME_FORMAT"
+#: conf/global_settings.py:47
+msgid "English"
+msgstr "Saesneg"
+
+#: conf/global_settings.py:48
+msgid "Spanish"
+msgstr "Spaeneg"
+
+#: conf/global_settings.py:49
+msgid "Argentinean Spanish"
 msgstr ""
 
-#: utils/translation.py:362
-msgid "TIME_FORMAT"
+#: conf/global_settings.py:50
+#, fuzzy
+msgid "Finnish"
+msgstr "Daneg"
+
+#: conf/global_settings.py:51
+msgid "French"
+msgstr "Ffrangeg"
+
+#: conf/global_settings.py:52
+msgid "Galician"
+msgstr "Galisieg"
+
+#: conf/global_settings.py:53
+msgid "Hungarian"
 msgstr ""
 
+#: conf/global_settings.py:54
+msgid "Hebrew"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Icelandic"
+msgstr "Islandeg"
+
+#: conf/global_settings.py:56
+msgid "Italian"
+msgstr "Eidaleg"
+
+#: conf/global_settings.py:57
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:58
+msgid "Kannada"
+msgstr ""
+
+#: conf/global_settings.py:59
+msgid "Latvian"
+msgstr ""
+
+#: conf/global_settings.py:60
+msgid "Macedonian"
+msgstr ""
+
+#: conf/global_settings.py:61
+msgid "Dutch"
+msgstr ""
+
+#: conf/global_settings.py:62
+msgid "Norwegian"
+msgstr "Norwyeg"
+
+#: conf/global_settings.py:63
+#, fuzzy
+msgid "Polish"
+msgstr "Saesneg"
+
+#: conf/global_settings.py:64
+msgid "Brazilian"
+msgstr "Brasileg"
+
+#: conf/global_settings.py:65
+msgid "Romanian"
+msgstr "Romaneg"
+
+#: conf/global_settings.py:66
+msgid "Russian"
+msgstr "Rwsieg"
+
+#: conf/global_settings.py:67
+msgid "Slovak"
+msgstr "Slofaceg"
+
+#: conf/global_settings.py:68
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slofaceg"
+
+#: conf/global_settings.py:69
+msgid "Serbian"
+msgstr "Serbeg"
+
+#: conf/global_settings.py:70
+msgid "Swedish"
+msgstr "Swedeg"
+
+#: conf/global_settings.py:71
+msgid "Tamil"
+msgstr ""
+
+#: conf/global_settings.py:72
+msgid "Telugu"
+msgstr ""
+
+#: conf/global_settings.py:73
+msgid "Turkish"
+msgstr ""
+
+#: conf/global_settings.py:74
+#, fuzzy
+msgid "Ukrainian"
+msgstr "Brasileg"
+
+#: conf/global_settings.py:75
+msgid "Simplified Chinese"
+msgstr "Tsieinëeg Symledig"
+
+#: conf/global_settings.py:76
+msgid "Traditional Chinese"
+msgstr ""
+
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] "blwyddyn"
+msgstr[1] "blynyddoedd"
+
+#: utils/timesince.py:13
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mis"
+msgstr[1] "misoedd"
+
+#: utils/timesince.py:14
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:15
+msgid "day"
+msgid_plural "days"
+msgstr[0] "diwrnod"
+msgstr[1] "diwrnodau"
+
+#: utils/timesince.py:16
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "awr"
+msgstr[1] "oriau"
+
+#: utils/timesince.py:17
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "munud"
+msgstr[1] "munudau"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Dydd Llun"
@@ -1456,157 +437,1741 @@ msgstr "Tach."
 msgid "Dec."
 msgstr "Rhag."
 
-#: utils/timesince.py:12
-msgid "year"
-msgid_plural "years"
-msgstr[0] "blwyddyn"
-msgstr[1] "blynyddoedd"
+#: utils/dateformat.py:40
+msgid "p.m."
+msgstr ""
 
-#: utils/timesince.py:13
-msgid "month"
-msgid_plural "months"
-msgstr[0] "mis"
-msgstr[1] "misoedd"
+#: utils/dateformat.py:41
+msgid "a.m."
+msgstr ""
 
-#: utils/timesince.py:14
-msgid "week"
-msgid_plural "weeks"
+#: utils/dateformat.py:46
+msgid "PM"
+msgstr ""
+
+#: utils/dateformat.py:47
+msgid "AM"
+msgstr ""
+
+#: utils/dateformat.py:95
+msgid "midnight"
+msgstr ""
+
+#: utils/dateformat.py:97
+msgid "noon"
+msgstr ""
+
+#: utils/translation/trans_real.py:362
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation/trans_real.py:363
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation/trans_real.py:364
+msgid "TIME_FORMAT"
+msgstr ""
+
+#: utils/translation/trans_real.py:380
+msgid "YEAR_MONTH_FORMAT"
+msgstr ""
+
+#: utils/translation/trans_real.py:381
+msgid "MONTH_DAY_FORMAT"
+msgstr ""
+
+#: oldforms/__init__.py:392
+#, python-format
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:15
-msgid "day"
-msgid_plural "days"
-msgstr[0] "diwrnod"
-msgstr[1] "diwrnodau"
+#: oldforms/__init__.py:397
+msgid "Line breaks are not allowed here."
+msgstr "Ni chaniateir toriadau llinell yma."
 
-#: utils/timesince.py:16
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "awr"
-msgstr[1] "oriau"
+#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Dewisiwch dewis dilys; dydy '%(data)s' dim mewn %(choices)s."
 
-#: utils/timesince.py:17
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "munud"
-msgstr[1] "munudau"
-
-#: conf/global_settings.py:37
-msgid "Bengali"
-msgstr "Bengaleg"
-
-#: conf/global_settings.py:38
-msgid "Czech"
-msgstr "Tsieceg"
-
-#: conf/global_settings.py:39
-msgid "Welsh"
-msgstr "Cymraeg"
-
-#: conf/global_settings.py:40
-msgid "Danish"
-msgstr "Daneg"
-
-#: conf/global_settings.py:41
-msgid "German"
-msgstr "Almaeneg"
-
-#: conf/global_settings.py:42
-msgid "Greek"
+#: oldforms/__init__.py:577 contrib/admin/filterspecs.py:150
+#: newforms/widgets.py:170
+msgid "Unknown"
 msgstr ""
 
-#: conf/global_settings.py:43
-msgid "English"
-msgstr "Saesneg"
+#: oldforms/__init__.py:577 contrib/admin/filterspecs.py:143
+#: newforms/widgets.py:170
+msgid "Yes"
+msgstr "Ie"
 
-#: conf/global_settings.py:44
-msgid "Spanish"
-msgstr "Spaeneg"
+#: oldforms/__init__.py:577 contrib/admin/filterspecs.py:143
+#: newforms/widgets.py:170
+msgid "No"
+msgstr "Na"
 
-#: conf/global_settings.py:45
-msgid "French"
-msgstr "Ffrangeg"
-
-#: conf/global_settings.py:46
-msgid "Galician"
-msgstr "Galisieg"
-
-#: conf/global_settings.py:47
-msgid "Hungarian"
+#: oldforms/__init__.py:672 core/validators.py:174 core/validators.py:445
+msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: conf/global_settings.py:48
-msgid "Hebrew"
+#: oldforms/__init__.py:674
+msgid "The submitted file is empty."
+msgstr "Mae'r ffeil yn wag."
+
+#: oldforms/__init__.py:730
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Rhowch rhif cyfan rhwng -32,768 a 32,767."
+
+#: oldforms/__init__.py:740
+msgid "Enter a positive number."
+msgstr "Rhowch rhif positif."
+
+#: oldforms/__init__.py:750
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Rhowch rhif cyfan rhwng 0 a 32,767."
+
+#: contrib/localflavor/uk/forms.py:18
+msgid "Enter a postcode. A space is required between the two postcode parts."
 msgstr ""
 
-#: conf/global_settings.py:49
-msgid "Icelandic"
-msgstr "Islandeg"
-
-#: conf/global_settings.py:50
-msgid "Italian"
-msgstr "Eidaleg"
-
-#: conf/global_settings.py:51
-msgid "Japanese"
+#: contrib/localflavor/usa/forms.py:17
+msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
 msgstr ""
 
-#: conf/global_settings.py:52
-msgid "Dutch"
+#: contrib/sessions/models.py:51
+msgid "session key"
+msgstr "goriad sesiwn"
+
+#: contrib/sessions/models.py:52
+msgid "session data"
+msgstr "data sesiwn"
+
+#: contrib/sessions/models.py:53
+msgid "expire date"
+msgstr "dyddiad darfod"
+
+#: contrib/sessions/models.py:57
+msgid "session"
+msgstr "sesiwn"
+
+#: contrib/sessions/models.py:58
+msgid "sessions"
+msgstr "sesiynau"
+
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
+msgid "The two password fields didn't match."
 msgstr ""
 
-#: conf/global_settings.py:53
-msgid "Norwegian"
-msgstr "Norwyeg"
+#: contrib/auth/forms.py:25
+msgid "A user with that username already exists."
+msgstr ""
 
-#: conf/global_settings.py:54
-msgid "Brazilian"
-msgstr "Brasileg"
+#: contrib/auth/forms.py:53
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
 
-#: conf/global_settings.py:55
-msgid "Romanian"
-msgstr "Romaneg"
+#: contrib/auth/forms.py:60 contrib/admin/views/decorators.py:10
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
 
-#: conf/global_settings.py:56
-msgid "Russian"
-msgstr "Rwsieg"
+#: contrib/auth/forms.py:62
+msgid "This account is inactive."
+msgstr ""
 
-#: conf/global_settings.py:57
-msgid "Slovak"
-msgstr "Slofaceg"
+#: contrib/auth/forms.py:85
+msgid ""
+"That e-mail address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
 
-#: conf/global_settings.py:58
+#: contrib/auth/forms.py:117
+msgid "The two 'new password' fields didn't match."
+msgstr ""
+
+#: contrib/auth/forms.py:124
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: contrib/auth/views.py:39
 #, fuzzy
-msgid "Slovenian"
-msgstr "Slofaceg"
+msgid "Logged out"
+msgstr "Allgofnodi"
 
-#: conf/global_settings.py:59
-msgid "Serbian"
-msgstr "Serbeg"
+#: contrib/auth/models.py:38 contrib/auth/models.py:57
+msgid "name"
+msgstr "enw"
 
-#: conf/global_settings.py:60
-msgid "Swedish"
-msgstr "Swedeg"
+#: contrib/auth/models.py:40
+msgid "codename"
+msgstr "enw arwyddol"
 
-#: conf/global_settings.py:61
+#: contrib/auth/models.py:42
 #, fuzzy
-msgid "Ukrainian"
-msgstr "Brasileg"
+msgid "permission"
+msgstr "Hawl"
 
-#: conf/global_settings.py:62
-msgid "Simplified Chinese"
-msgstr "Tsieinëeg Symledig"
+#: contrib/auth/models.py:43 contrib/auth/models.py:58
+#, fuzzy
+msgid "permissions"
+msgstr "Hawliau"
 
-#: conf/global_settings.py:63
-msgid "Traditional Chinese"
+#: contrib/auth/models.py:60
+#, fuzzy
+msgid "group"
+msgstr "Grŵp"
+
+#: contrib/auth/models.py:61 contrib/auth/models.py:100
+#, fuzzy
+msgid "groups"
+msgstr "Grwpiau"
+
+#: contrib/auth/models.py:90
+msgid "username"
+msgstr "enw defnyddiwr"
+
+#: contrib/auth/models.py:90
+msgid ""
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
+"digits and underscores)."
 msgstr ""
 
-#: core/validators.py:60
+#: contrib/auth/models.py:91
+msgid "first name"
+msgstr "enw cyntaf"
+
+#: contrib/auth/models.py:92
+msgid "last name"
+msgstr "enw olaf"
+
+#: contrib/auth/models.py:93
+msgid "e-mail address"
+msgstr "cyfeiriad e-bost"
+
+#: contrib/auth/models.py:94
+msgid "password"
+msgstr "cyfrinair"
+
+#: contrib/auth/models.py:94
+msgid ""
+"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
+"password form</a>."
+msgstr ""
+
+#: contrib/auth/models.py:95
+msgid "staff status"
+msgstr "statws staff"
+
+#: contrib/auth/models.py:95
+msgid "Designates whether the user can log into this admin site."
+msgstr "Dylunio ai'r defnyddiwr yn gally mewngofnodi i'r safle weinyddiad yma."
+
+#: contrib/auth/models.py:96
+msgid "active"
+msgstr "gweithredol"
+
+#: contrib/auth/models.py:96
+#, fuzzy
+msgid ""
+"Designates whether this user can log into the Django admin. Unselect this "
+"instead of deleting accounts."
+msgstr "Dylunio ai'r defnyddiwr yn gally mewngofnodi i'r safle weinyddiad yma."
+
+#: contrib/auth/models.py:97
+msgid "superuser status"
+msgstr "statws defnyddiwr swper"
+
+#: contrib/auth/models.py:97
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+
+#: contrib/auth/models.py:98
+msgid "last login"
+msgstr "mewngofnod olaf"
+
+#: contrib/auth/models.py:99
+msgid "date joined"
+msgstr "Dyddiad"
+
+#: contrib/auth/models.py:101
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Yn ogystal â'r hawliau trosglwyddwyd dros law, byddai'r defnyddiwr yma hefyd "
+"yn cael y cwbl hawliau a addefwyd i pob grŵp mae o/hi mewn."
+
+#: contrib/auth/models.py:102
+#, fuzzy
+msgid "user permissions"
+msgstr "Hawliau"
+
+#: contrib/auth/models.py:105
+#, fuzzy
+msgid "user"
+msgstr "Defnyddiwr"
+
+#: contrib/auth/models.py:106
+#, fuzzy
+msgid "users"
+msgstr "Defnyddwyr"
+
+#: contrib/auth/models.py:111
+msgid "Personal info"
+msgstr "Gwybodaeth personol"
+
+#: contrib/auth/models.py:112
+msgid "Permissions"
+msgstr "Hawliau"
+
+#: contrib/auth/models.py:113
+msgid "Important dates"
+msgstr "Dyddiadau pwysig"
+
+#: contrib/auth/models.py:114
+msgid "Groups"
+msgstr "Grwpiau"
+
+#: contrib/auth/models.py:258
+#, fuzzy
+msgid "message"
+msgstr "Neges"
+
+#: contrib/humanize/templatetags/humanize.py:16
+msgid "th"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:16
+#, fuzzy
+msgid "st"
+msgstr "safle"
+
+#: contrib/humanize/templatetags/humanize.py:16
+#, fuzzy
+msgid "nd"
+msgstr "ac"
+
+#: contrib/humanize/templatetags/humanize.py:16
+msgid "rd"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:46
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/humanize/templatetags/humanize.py:49
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/humanize/templatetags/humanize.py:52
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/humanize/templatetags/humanize.py:67
+msgid "one"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:67
+msgid "two"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:67
+msgid "three"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:67
+#, fuzzy
+msgid "four"
+msgstr "awr"
+
+#: contrib/humanize/templatetags/humanize.py:67
+msgid "five"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:67
+msgid "six"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:67
+msgid "seven"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:67
+msgid "eight"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:67
+msgid "nine"
+msgstr ""
+
+#: contrib/contenttypes/models.py:36
+#, fuzzy
+msgid "python model class name"
+msgstr "enw modwl python"
+
+#: contrib/contenttypes/models.py:39
+msgid "content type"
+msgstr "math cynnwys"
+
+#: contrib/contenttypes/models.py:40
+msgid "content types"
+msgstr "mathau cynnwys"
+
+#: contrib/redirects/models.py:7
+msgid "redirect from"
+msgstr "ailgyfeirio o"
+
+#: contrib/redirects/models.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Ddylai hon bod yn lwybr hollol, heb y parth-enw. Er enghraifft: '/"
+"digwyddiadau/chwilio/'."
+
+#: contrib/redirects/models.py:9
+msgid "redirect to"
+msgstr "ailgyfeirio i"
+
+#: contrib/redirects/models.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Gellir fod naill ai llwybr hollol (fel uwch) neu URL hollol yn ddechrau â "
+"'http://'."
+
+#: contrib/redirects/models.py:13
+msgid "redirect"
+msgstr "ailgyfeiriad"
+
+#: contrib/redirects/models.py:14
+msgid "redirects"
+msgstr "ailgyfeiriadau"
+
+#: contrib/flatpages/models.py:7 contrib/admin/views/doc.py:315
+msgid "URL"
+msgstr "URL"
+
+#: contrib/flatpages/models.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Er enghraifft: '/amdan/cyswllt/'. Sicrhewch gennych slaesau arweiniol ac "
+"trywyddiol."
+
+#: contrib/flatpages/models.py:9
+msgid "title"
+msgstr "teitl"
+
+#: contrib/flatpages/models.py:10
+msgid "content"
+msgstr "cynnwys"
+
+#: contrib/flatpages/models.py:11
+msgid "enable comments"
+msgstr "galluogi sylwadau"
+
+#: contrib/flatpages/models.py:12
+msgid "template name"
+msgstr "enw'r templed"
+
+#: contrib/flatpages/models.py:13
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+"Er enghraifft: 'flatpages/tudalen_cyswllt'. Os nid darparwyd, ddefnyddia'r "
+"system 'flatpages/default'."
+
+#: contrib/flatpages/models.py:14
+msgid "registration required"
+msgstr "cofrestriad gofynnol"
+
+#: contrib/flatpages/models.py:14
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Os wedi dewis, dim ond defnyddwyr a mewngofnodwyd bydd yn gallu gweld y "
+"tudalen."
+
+#: contrib/flatpages/models.py:18
+msgid "flat page"
+msgstr "tudalen fflat"
+
+#: contrib/flatpages/models.py:19
+msgid "flat pages"
+msgstr "tudalennau fflat"
+
+#: contrib/comments/models.py:67 contrib/comments/models.py:166
+msgid "object ID"
+msgstr "ID gwrthrych"
+
+#: contrib/comments/models.py:68
+msgid "headline"
+msgstr "pennawd"
+
+#: contrib/comments/models.py:69 contrib/comments/models.py:90
+#: contrib/comments/models.py:167
+msgid "comment"
+msgstr "sylw"
+
+#: contrib/comments/models.py:70
+msgid "rating #1"
+msgstr "cyfraddiad #1"
+
+#: contrib/comments/models.py:71
+msgid "rating #2"
+msgstr "cyfraddiad #2"
+
+#: contrib/comments/models.py:72
+msgid "rating #3"
+msgstr "cyfraddiad #3"
+
+#: contrib/comments/models.py:73
+msgid "rating #4"
+msgstr "cyfraddiad #4"
+
+#: contrib/comments/models.py:74
+msgid "rating #5"
+msgstr "cyfraddiad #5"
+
+#: contrib/comments/models.py:75
+msgid "rating #6"
+msgstr "cyfraddiad #6"
+
+#: contrib/comments/models.py:76
+msgid "rating #7"
+msgstr "cyfraddiad #7"
+
+#: contrib/comments/models.py:77
+msgid "rating #8"
+msgstr "cyfraddiad #8"
+
+#: contrib/comments/models.py:82
+msgid "is valid rating"
+msgstr "yn gyfraddiad dilys"
+
+#: contrib/comments/models.py:83 contrib/comments/models.py:169
+msgid "date/time submitted"
+msgstr "dyddiad/amser wedi ymostwng"
+
+#: contrib/comments/models.py:84 contrib/comments/models.py:170
+msgid "is public"
+msgstr "yn gyhoeddus"
+
+#: contrib/comments/models.py:85 contrib/admin/views/doc.py:304
+msgid "IP address"
+msgstr "cyfeiriad IP"
+
+#: contrib/comments/models.py:86
+msgid "is removed"
+msgstr "wedi diddymu"
+
+#: contrib/comments/models.py:86
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models.py:91
+#, fuzzy
+msgid "comments"
+msgstr "sylw"
+
+#: contrib/comments/models.py:131 contrib/comments/models.py:207
+msgid "Content object"
+msgstr "Gwrthrych cynnwys"
+
+#: contrib/comments/models.py:159
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\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.py:168
+msgid "person's name"
+msgstr "enw'r person"
+
+#: contrib/comments/models.py:171
+msgid "ip address"
+msgstr "cyfeiriad ip"
+
+#: contrib/comments/models.py:173
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models.py:176
+#, fuzzy
+msgid "free comment"
+msgstr "Sylw rhydd"
+
+#: contrib/comments/models.py:177
+#, fuzzy
+msgid "free comments"
+msgstr "Sylwadau rhydd"
+
+#: contrib/comments/models.py:233
+msgid "score"
+msgstr "sgôr"
+
+#: contrib/comments/models.py:234
+msgid "score date"
+msgstr "dyddiad sgôr"
+
+#: contrib/comments/models.py:237
+#, fuzzy
+msgid "karma score"
+msgstr "Sgôr Carma"
+
+#: contrib/comments/models.py:238
+#, fuzzy
+msgid "karma scores"
+msgstr "Sgorau Carma"
+
+#: contrib/comments/models.py:242
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr "%(score)d"
+
+#: contrib/comments/models.py:258
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models.py:265
+msgid "flag date"
+msgstr "fflagio dyddiad"
+
+#: contrib/comments/models.py:268
+#, fuzzy
+msgid "user flag"
+msgstr "Fflag defnyddiwr"
+
+#: contrib/comments/models.py:269
+#, fuzzy
+msgid "user flags"
+msgstr "Fflagiau defnyddwyr"
+
+#: contrib/comments/models.py:273
+#, python-format
+msgid "Flag by %r"
+msgstr "Fflagio hefo %r"
+
+#: contrib/comments/models.py:278
+msgid "deletion date"
+msgstr "dyddiad dilead"
+
+#: contrib/comments/models.py:280
+#, fuzzy
+msgid "moderator deletion"
+msgstr "Dilead cymedrolwr"
+
+#: contrib/comments/models.py:281
+#, fuzzy
+msgid "moderator deletions"
+msgstr "Dileadau cymedrolwr"
+
+#: contrib/comments/models.py:285
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr "Dilead cymedrolwr gan %r"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:17
+msgid "Username:"
+msgstr "Enw defnyddiwr:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/model_index.html:5
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+msgid "Log out"
+msgstr "Allgofnodi"
+
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:20
+msgid "Password:"
+msgstr "Cyfrinair:"
+
+#: contrib/comments/templates/comments/form.html:8
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Newidio fy nghyfrinair"
+
+#: contrib/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "cyfraddiad #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:28
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Sylw"
+
+#: contrib/comments/templates/comments/form.html:35
+#: contrib/comments/templates/comments/freeform.html:10
+#, fuzzy
+msgid "Preview comment"
+msgstr "Sylw rhydd"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "enw defnyddiwr"
+
+#: contrib/comments/views/karma.py:19
+msgid "Anonymous users cannot vote"
+msgstr "Ni gellir defnyddwyr dienw pleidleisio"
+
+#: contrib/comments/views/karma.py:23
+msgid "Invalid comment ID"
+msgstr "ID sylw annilys"
+
+#: contrib/comments/views/karma.py:25
+msgid "No voting for yourself"
+msgstr "Dim pleidleisio ar gyfer eich hun"
+
+#: contrib/comments/views/comments.py:27
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:111
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/comments/views/comments.py:116
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:280
+msgid "Only POSTs are allowed"
+msgstr "Caniateir POSTiau yn unig"
+
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:284
+msgid "One or more of the required fields wasn't submitted"
+msgstr ""
+
+#: contrib/comments/views/comments.py:196
+#: contrib/comments/views/comments.py:286
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr ""
+
+#: contrib/comments/views/comments.py:206
+#: contrib/comments/views/comments.py:292
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+
+#: contrib/comments/views/comments.py:257
+#: contrib/comments/views/comments.py:321
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/sites/models.py:10
+msgid "domain name"
+msgstr "parth-enw"
+
+#: contrib/sites/models.py:11
+msgid "display name"
+msgstr "enw arddangos"
+
+#: contrib/sites/models.py:15
+msgid "site"
+msgstr "safle"
+
+#: contrib/sites/models.py:16
+msgid "sites"
+msgstr "safleoedd"
+
+#: contrib/admin/filterspecs.py:40
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr "Unrhyw dyddiad"
+
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
+msgstr "Heddiw"
+
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr "7 diwrnod gorffennol"
+
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
+msgstr "Mis yma"
+
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
+msgstr "Blwyddyn yma"
+
+#: contrib/admin/models.py:16
+msgid "action time"
+msgstr "amser gweithred"
+
+#: contrib/admin/models.py:19
+msgid "object id"
+msgstr "id gwrthrych"
+
+#: contrib/admin/models.py:20
+msgid "object repr"
+msgstr "repr gwrthrych"
+
+#: contrib/admin/models.py:21
+msgid "action flag"
+msgstr "fflag gweithred"
+
+#: contrib/admin/models.py:22
+msgid "change message"
+msgstr "neges newid"
+
+#: contrib/admin/models.py:25
+msgid "log entry"
+msgstr "cofnod"
+
+#: contrib/admin/models.py:26
+msgid "log entries"
+msgstr "cofnodion"
+
+#: contrib/admin/templatetags/admin_list.py:247
+msgid "All dates"
+msgstr "Dyddiadau i gyd"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/invalid_setup.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/change_list.html:6
+#: contrib/admin/templates/admin/change_form.html:13
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/auth/user/change_password.html:12
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+msgid "Home"
+msgstr "Adref"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+msgid "Documentation"
+msgstr "Dogfennaeth"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Dalennau gofnod"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/model_index.html:5
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/admin/auth/user/change_password.html:15
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+msgid "Change password"
+msgstr "Newid cyfrinair"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "Dogfennaeth dalennau gofnod"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Dogfennaeth er mwyn y dudalen yma"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+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 "
+"cynrychioligwrthrych sengl."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+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 "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 "Fel uwchben, ond yn agor y dudalen weinyddiad mewn ffenestr newydd."
+
+#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/delete_confirmation.html:9
+msgid "Delete"
+msgstr "Dileu"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Cadw fel newydd"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Cadw ac ychwanegu un arall"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Cadw ac parhau i olygu"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Cadw"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Gwall gweinyddwr"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Gwall gweinyddwr (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Gwall Gweinyddwr <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Mae gwall wedi digwydd. Adroddwyd i weinyddwyr y safle drwy e-bost ac ddylai "
+"cael ei drwsio cyn bo hir."
+
+#: contrib/admin/templates/admin/filter.html:2
+#, fuzzy, python-format
+msgid " By %(filter_title)s "
+msgstr " Gan %(title)s"
+
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr ""
+
+#: contrib/admin/templates/admin/invalid_setup.html:8
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "Ewch"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "1 result"
+msgid_plural "%(counter)s results"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr ""
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:21
+msgid "History"
+msgstr "Hanes"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "Dyddiad/amser"
+
+#: contrib/admin/templates/admin/object_history.html:19
+msgid "User"
+msgstr "Defnyddiwr"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "Gweithred"
+
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "N j, Y, P"
+
+#: contrib/admin/templates/admin/object_history.html:36
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Does dim hanes newid gan y gwrthrych yma. Mae'n debyg ni ychwanegwyd drwy'r "
+"safle gweinydd yma."
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, fuzzy, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+"Bydda dileu'r %(object_name)s '%(object)s' yn ddilyn i dileu'r wrthrychau "
+"perthynol, ond ni chaniateir eich cyfrif ddileu'r mathau o wrthrych canlynol:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:21
+#, fuzzy, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+"Ydych yn sicr chi eiso ddileu'r %(object_name)s \"%(object)s\"? Bydd y cwbl "
+"o'r eitemau perthynol canlynol yn cae eu ddileu:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:26
+msgid "Yes, I'm sure"
+msgstr "Yndw, rwy'n sicr"
+
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_list.html:12
+#, python-format
+msgid "Add %(name)s"
+msgstr "Ychwanegu %(name)s"
+
+#: contrib/admin/templates/admin/change_form.html:15
+#: contrib/admin/templates/admin/index.html:28
+msgid "Add"
+msgstr "Ychwanegu"
+
+#: contrib/admin/templates/admin/change_form.html:22
+msgid "View on site"
+msgstr "Gweld ar safle"
+
+#: contrib/admin/templates/admin/change_form.html:32
+#: contrib/admin/templates/admin/auth/user/change_password.html:24
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:50
+msgid "Ordering"
+msgstr "Trefnu"
+
+#: contrib/admin/templates/admin/change_form.html:53
+msgid "Order:"
+msgstr "Trefn:"
+
+#: contrib/admin/templates/admin/base.html:25
+msgid "Welcome,"
+msgstr "Croeso,"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Tudalen heb ei ddarganfod"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Mae'n ddrwg gennym, ond nid darganfwyd y dudalen a dymunwyd"
+
+#: contrib/admin/templates/admin/login.html:25
+#: contrib/admin/views/decorators.py:24
+msgid "Log in"
+msgstr "Mewngofnodi"
+
+#: contrib/admin/templates/admin/index.html:17
+#, python-format
+msgid "Models available in the %(name)s application."
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:18
+#, fuzzy, python-format
+msgid "%(name)s"
+msgstr "Ychwanegu %(name)s"
+
+#: contrib/admin/templates/admin/index.html:34
+msgid "Change"
+msgstr "Newidio"
+
+#: contrib/admin/templates/admin/index.html:44
+msgid "You don't have permission to edit anything."
+msgstr "Does genych ddim hawl i olygu unrhywbeth."
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "Recent Actions"
+msgstr "Gweithredau Diweddar"
+
+#: contrib/admin/templates/admin/index.html:53
+msgid "My Actions"
+msgstr "Fy Ngweithredau"
+
+#: contrib/admin/templates/admin/index.html:57
+msgid "None available"
+msgstr "Dim ar gael"
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Gweinyddiad safle Django"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Gweinyddiad Django"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:6
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:12
+#, fuzzy
+msgid "Username"
+msgstr "Enw defnyddiwr:"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/change_password.html:34
+#, fuzzy
+msgid "Password"
+msgstr "Cyfrinair:"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#, fuzzy
+msgid "Password (again)"
+msgstr "Newid cyfrinair"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
+#: contrib/admin/templates/admin/auth/user/change_password.html:40
+msgid "Enter the same password as above, for verification."
+msgstr ""
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Newidio"
+
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "Dyddiad:"
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "Amser:"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Diolch am dreulio amser ansawdd gyda'r safle we heddiw 'ma."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Ailmewngofnodi"
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Chi'n derbyn yr e-bost yma achos ddymunwyd ailosod cyfrinair"
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "er mwyn eich cyfrif defnyddiwr ar %(site_name)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr "Eich cyfrinair newydd yw: %(new_password)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
+msgstr "Mae croeso i chi newid y gyfrinair hon wrth fynd i'r dudalen yma:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "Eich enw defnyddiwr, rhag ofn chi wedi anghofio:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "Diolch am ddefnyddio ein safle!"
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Y tîm %(site_name)s"
+
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
+msgid "Password reset"
+msgstr "Ailosod cyfrinair"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Ailosod cyfrinair yn lwyddianus"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr "Wedi e-bostio cyfrinair newydd i'r gyfeiriad e-bost "
+
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
+#: contrib/admin/templates/registration/password_change_done.html:4
+msgid "Password change"
+msgstr "Newid cyfrinair"
+
+#: contrib/admin/templates/registration/password_change_form.html:12
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Rhowch eich cyfrinair hen, er mwyn gwarchodaeth, yna rhowch eich cyfrinair "
+"newydd dwywaith er mwyn i ni wirio y teipiwyd yn gywir."
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "Cyfrinair hen:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "Cyfrinair newydd:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "Cadarnhewch cyfrinair:"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "Newidio fy nghyfrinair"
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr "Newid cyfrinair yn lwyddianus"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "Newidwyd eich cyfrinair."
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Wedi anghofio eich cyfrinair? Rhowch eich cyfeiriad e-bost isod, ac "
+"ailosodan eich cyfrinair ac e-bostio'r un newydd i chi."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Cyfeiriad e-bost:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Ailosodi fy nghyfrinair"
+
+#: contrib/admin/views/main.py:223
+msgid "Site administration"
+msgstr "Gweinyddiad safle"
+
+#: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:19
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347
+#: contrib/admin/views/auth.py:24
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:289
+#, python-format
+msgid "Add %s"
+msgstr "Ychwanegu %s"
+
+#: contrib/admin/views/main.py:335
+#, python-format
+msgid "Added %s."
+msgstr "Ychwanegwyd %s."
+
+#: contrib/admin/views/main.py:337
+#, python-format
+msgid "Changed %s."
+msgstr "Newidiwyd %s."
+
+#: contrib/admin/views/main.py:339
+#, python-format
+msgid "Deleted %s."
+msgstr "Dileuwyd %s."
+
+#: contrib/admin/views/main.py:342
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:345
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:353
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:391
+#, python-format
+msgid "Change %s"
+msgstr "Newidio %s"
+
+#: contrib/admin/views/main.py:476
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:481
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:514
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:517
+msgid "Are you sure?"
+msgstr "Ydych yn sicr?"
+
+#: contrib/admin/views/main.py:539
+#, python-format
+msgid "Change history: %s"
+msgstr "Hanes newid: %s"
+
+#: contrib/admin/views/main.py:573
+#, python-format
+msgid "Select %s"
+msgstr "Dewis %s"
+
+#: contrib/admin/views/main.py:573
+#, python-format
+msgid "Select %s to change"
+msgstr "Dewis %s i newid"
+
+#: contrib/admin/views/main.py:768
+msgid "Database error"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:62
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:69
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:83
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:85
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48
+#: contrib/admin/views/doc.py:50
+msgid "tag:"
+msgstr ""
+
+#: contrib/admin/views/doc.py:77 contrib/admin/views/doc.py:79
+#: contrib/admin/views/doc.py:81
+msgid "filter:"
+msgstr ""
+
+#: contrib/admin/views/doc.py:135 contrib/admin/views/doc.py:137
+#: contrib/admin/views/doc.py:139
+msgid "view:"
+msgstr ""
+
+#: contrib/admin/views/doc.py:164
+#, fuzzy, python-format
+msgid "App %r not found"
+msgstr "Tudalen heb ei ddarganfod"
+
+#: contrib/admin/views/doc.py:171
+#, python-format
+msgid "Model %(name)r not found in app %(label)r"
+msgstr ""
+
+#: contrib/admin/views/doc.py:183
+#, python-format
+msgid "the related `%(label)s.%(type)s` object"
+msgstr ""
+
+#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205
+#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224
+msgid "model:"
+msgstr ""
+
+#: contrib/admin/views/doc.py:214
+#, python-format
+msgid "related `%(label)s.%(name)s` objects"
+msgstr ""
+
+#: contrib/admin/views/doc.py:219
+#, python-format
+msgid "all %s"
+msgstr ""
+
+#: contrib/admin/views/doc.py:224
+#, python-format
+msgid "number of %s"
+msgstr ""
+
+#: contrib/admin/views/doc.py:229
+#, python-format
+msgid "Fields on %s objects"
+msgstr ""
+
+#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301
+#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309
+#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:292
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:294
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:295
+msgid "Date (without time)"
+msgstr "Dyddiad (heb amser)"
+
+#: contrib/admin/views/doc.py:296
+msgid "Date (with time)"
+msgstr "Dyddiad (gyda amser)"
+
+#: contrib/admin/views/doc.py:297
+msgid "E-mail address"
+msgstr "Cyfeiriad e-bost"
+
+#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299
+#: contrib/admin/views/doc.py:302
+msgid "File path"
+msgstr "Llwybr ffeil"
+
+#: contrib/admin/views/doc.py:300
+msgid "Decimal number"
+msgstr "Rhif degol"
+
+#: contrib/admin/views/doc.py:306
+msgid "Boolean (Either True, False or None)"
+msgstr "Boole (Naill ai True, False neu None)"
+
+#: contrib/admin/views/doc.py:307
+msgid "Relation to parent model"
+msgstr "Perthynas i model rhiant"
+
+#: contrib/admin/views/doc.py:308
+msgid "Phone number"
+msgstr "Rhif ffôn"
+
+#: contrib/admin/views/doc.py:313
+msgid "Text"
+msgstr "Testun"
+
+#: contrib/admin/views/doc.py:314
+msgid "Time"
+msgstr "Amser"
+
+#: contrib/admin/views/doc.py:316
+msgid "U.S. state (two uppercase letters)"
+msgstr "Talaith U.D. (dwy briflythyren)"
+
+#: contrib/admin/views/doc.py:317
+msgid "XML text"
+msgstr "Testun XML"
+
+#: contrib/admin/views/doc.py:343
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr ""
+
+#: contrib/admin/views/auth.py:30
+#, fuzzy
+msgid "Add user"
+msgstr "Ychwanegu %s"
+
+#: contrib/admin/views/auth.py:57
+#, fuzzy
+msgid "Password changed successfully."
+msgstr "Newid cyfrinair yn lwyddianus"
+
+#: contrib/admin/views/auth.py:64
+#, fuzzy, python-format
+msgid "Change password: %s"
+msgstr "Newid cyfrinair"
+
+#: newforms/fields.py:101 newforms/fields.py:254
+#, python-format
+msgid "Ensure this value has at most %d characters."
+msgstr ""
+
+#: newforms/fields.py:103 newforms/fields.py:256
+#, python-format
+msgid "Ensure this value has at least %d characters."
+msgstr ""
+
+#: newforms/fields.py:126 core/validators.py:120
+msgid "Enter a whole number."
+msgstr "Rhowch rhif cyfan."
+
+#: newforms/fields.py:128
+#, fuzzy, python-format
+msgid "Ensure this value is less than or equal to %s."
+msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
+
+#: newforms/fields.py:130
+#, python-format
+msgid "Ensure this value is greater than or equal to %s."
+msgstr ""
+
+#: newforms/fields.py:163
+#, fuzzy
+msgid "Enter a valid date."
+msgstr "Rhowch enw ffeil dilys."
+
+#: newforms/fields.py:190
+#, fuzzy
+msgid "Enter a valid time."
+msgstr "Rhowch enw ffeil dilys."
+
+#: newforms/fields.py:226
+#, fuzzy
+msgid "Enter a valid date/time."
+msgstr "Rhowch enw ffeil dilys."
+
+#: newforms/fields.py:240
+#, fuzzy
+msgid "Enter a valid value."
+msgstr "Rhowch enw ffeil dilys."
+
+#: newforms/fields.py:269 core/validators.py:162
+msgid "Enter a valid e-mail address."
+msgstr "Rhowch cyfeiriad e-bost ddilys."
+
+#: newforms/fields.py:287 newforms/fields.py:309
+#, fuzzy
+msgid "Enter a valid URL."
+msgstr "Rhowch enw ffeil dilys."
+
+#: newforms/fields.py:311
+#, fuzzy
+msgid "This URL appears to be a broken link."
+msgstr "Mae'r URL %s yn gyswllt toredig."
+
+#: newforms/fields.py:360 newforms/models.py:164
+#, fuzzy
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Dewisiwch dewis dilys; dydy '%(data)s' dim mewn %(choices)s."
+
+#: newforms/fields.py:378 newforms/fields.py:454 newforms/models.py:181
+#, fuzzy
+msgid "Enter a list of values."
+msgstr "Rhowch enw ffeil dilys."
+
+#: newforms/fields.py:387 newforms/models.py:187
+#, fuzzy, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "Dewisiwch dewis dilys; dydy '%(data)s' dim mewn %(choices)s."
+
+#: template/defaultfilters.py:491
+msgid "yes,no,maybe"
+msgstr "ie,na,efallai"
+
+#: views/generic/create_update.py:43
+#, python-format
+msgid "The %(verbose_name)s was created successfully."
+msgstr ""
+
+#: views/generic/create_update.py:117
+#, python-format
+msgid "The %(verbose_name)s was updated successfully."
+msgstr ""
+
+#: views/generic/create_update.py:184
+#, fuzzy, python-format
+msgid "The %(verbose_name)s was deleted."
+msgstr "Y tîm %(site_name)s"
+
+#: core/validators.py:64
 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:64
+#: core/validators.py:68
 #, fuzzy
 msgid ""
 "This value must contain only letters, numbers, underscores, dashes or "
@@ -1616,62 +2181,62 @@ msgstr ""
 "unig."
 
 #: core/validators.py:72
+#, fuzzy
+msgid "This value must contain only letters, numbers, underscores or hyphens."
+msgstr ""
+"Rhaid i'r werth yma cynnwys lythrennau, rhifau, tanlinellau ac slaesau yn "
+"unig."
+
+#: core/validators.py:76
 msgid "Uppercase letters are not allowed here."
 msgstr "Ni chaniateir priflythrennau yma."
 
-#: core/validators.py:76
+#: core/validators.py:80
 msgid "Lowercase letters are not allowed here."
 msgstr "Ni chaniateir lythrennau bach yma."
 
-#: core/validators.py:83
+#: core/validators.py:87
 msgid "Enter only digits separated by commas."
 msgstr "Rhowch digidau gwahanu gyda atalnodau yn unig."
 
-#: core/validators.py:95
+#: core/validators.py:99
 msgid "Enter valid e-mail addresses separated by commas."
 msgstr "Rhowch cyfeiriad e-bost dilys gwahanu gyda atalnodau."
 
-#: core/validators.py:99
+#: core/validators.py:103
 msgid "Please enter a valid IP address."
 msgstr "Rhowch cyfeiriad IP dilys, os gwelwch yn dda."
 
-#: core/validators.py:103
+#: core/validators.py:107
 msgid "Empty values are not allowed here."
 msgstr "Ni chaniateir gwerthau gwag yma."
 
-#: core/validators.py:107
+#: core/validators.py:111
 msgid "Non-numeric characters aren't allowed here."
 msgstr "Ni chaniateir nodau anrhifol yma."
 
-#: core/validators.py:111
+#: core/validators.py:115
 msgid "This value can't be comprised solely of digits."
 msgstr "Ni gellir y werth yma"
 
-#: core/validators.py:116
-msgid "Enter a whole number."
-msgstr "Rhowch rhif cyfan."
-
-#: core/validators.py:120
+#: core/validators.py:124
 msgid "Only alphabetical characters are allowed here."
 msgstr "Caniateir nodau gwyddorol un unig yma."
 
-#: core/validators.py:124
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Rhowch dyddiad dilys mewn fformat YYYY-MM-DD."
+#: core/validators.py:139
+msgid "Year must be 1900 or later."
+msgstr ""
 
-#: core/validators.py:128
+#: core/validators.py:143
+#, fuzzy, python-format
+msgid "Invalid date: %s"
+msgstr "URL annilys: %s"
+
+#: core/validators.py:153
 msgid "Enter a valid time in HH:MM format."
 msgstr "Rhowch amser ddilys mewn fformat HH:MM."
 
-#: core/validators.py:132 db/models/fields/__init__.py:468
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Rhowch dyddiad/amser ddilys mewn fformat YYYY-MM-DD HH:MM."
-
-#: core/validators.py:136
-msgid "Enter a valid e-mail address."
-msgstr "Rhowch cyfeiriad e-bost ddilys."
-
-#: core/validators.py:148
+#: core/validators.py:178
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -1679,26 +2244,26 @@ msgstr ""
 "Llwythwch delwedd dilys. Doedd y delwedd a llwythwyd dim yn ddelwedd dilys, "
 "neu roedd o'n ddelwedd llwgr."
 
-#: core/validators.py:155
+#: core/validators.py:185
 #, python-format
 msgid "The URL %s does not point to a valid image."
 msgstr "Dydy'r URL %s dim yn pwyntio at delwedd dilys."
 
-#: core/validators.py:159
+#: core/validators.py:189
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr "Rhaid rifau ffon bod mewn fformat XXX-XXX-XXXX. Mae \"%s\" yn annilys."
 
-#: core/validators.py:167
+#: core/validators.py:197
 #, python-format
 msgid "The URL %s does not point to a valid QuickTime video."
 msgstr "Dydy'r URL %s dim yn pwyntio at fideo Quicktime dilys."
 
-#: core/validators.py:171
+#: core/validators.py:201
 msgid "A valid URL is required."
 msgstr "Mae URL dilys yn ofynnol."
 
-#: core/validators.py:185
+#: core/validators.py:215
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
@@ -1707,69 +2272,84 @@ msgstr ""
 "Mae HTML dilys yn ofynnol. Gwallau penodol yw:\n"
 "%s"
 
-#: core/validators.py:192
+#: core/validators.py:222
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr "XML wedi ffurfio'n wael: %s"
 
-#: core/validators.py:202
+#: core/validators.py:239
 #, python-format
 msgid "Invalid URL: %s"
 msgstr "URL annilys: %s"
 
-#: core/validators.py:206 core/validators.py:208
+#: core/validators.py:244 core/validators.py:246
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "Mae'r URL %s yn gyswllt toredig."
 
-#: core/validators.py:214
+#: core/validators.py:252
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Rhowch talfyriad dalaith U.S. dilys."
 
-#: core/validators.py:229
+#: core/validators.py:266
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
 msgstr[0] "Gwyliwch eich ceg! Ni chaniateir y gair %s yma."
 msgstr[1] "Gwyliwch eich ceg! Ni chaniateir y geiriau %s yma."
 
-#: core/validators.py:236
+#: core/validators.py:273
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Rhaid i'r faes yma cydweddu'r faes '%s'."
 
-#: core/validators.py:255
+#: core/validators.py:292
 msgid "Please enter something for at least one field."
 msgstr "Rhowch rhywbeth am un maes o leiaf, os gwelwch yn dda."
 
-#: core/validators.py:264 core/validators.py:275
+#: core/validators.py:301 core/validators.py:312
 msgid "Please enter both fields or leave them both empty."
 msgstr "Llenwch y ddwy faes, neu gadewch nhw'n wag, os gwelwch yn dda."
 
-#: core/validators.py:282
+#: core/validators.py:320
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Rhaid roi'r faes yma os mae %(field)s yn %(value)s"
 
-#: core/validators.py:294
+#: core/validators.py:333
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "Rhaid roi'r faes yma os mae %(field)s dim yn %(value)s"
 
-#: core/validators.py:313
+#: core/validators.py:352
 msgid "Duplicate values are not allowed."
 msgstr "Ni chaniateir gwerthau ddyblyg."
 
-#: core/validators.py:336
+#: core/validators.py:367
+#, fuzzy, python-format
+msgid "This value must be between %(lower)s and %(upper)s."
+msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
+
+#: core/validators.py:369
+#, fuzzy, python-format
+msgid "This value must be at least %s."
+msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
+
+#: core/validators.py:371
+#, fuzzy, python-format
+msgid "This value must be no more than %s."
+msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
+
+#: core/validators.py:407
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
 
-#: core/validators.py:347
+#: core/validators.py:418
 msgid "Please enter a valid decimal number."
 msgstr "Rhowch rhif degol dilys, os gwelwch yn dda."
 
-#: core/validators.py:349
+#: core/validators.py:422
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -1777,7 +2357,16 @@ msgid_plural ""
 msgstr[0] "Rhowch rhif degol dilys gyda cyfanswm %s digidau o fwyaf."
 msgstr[1] "Rhowch rhif degol dilys gyda cyfanswm %s digid o fwyaf."
 
-#: core/validators.py:352
+#: core/validators.py:425
+#, fuzzy, python-format
+msgid ""
+"Please enter a valid decimal number with a whole part of at most %s digit."
+msgid_plural ""
+"Please enter a valid decimal number with a whole part of at most %s digits."
+msgstr[0] "Rhowch rhif degol dilys gyda cyfanswm %s digidau o fwyaf."
+msgstr[1] "Rhowch rhif degol dilys gyda cyfanswm %s digid o fwyaf."
+
+#: core/validators.py:428
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -1787,37 +2376,37 @@ msgstr[0] ""
 msgstr[1] ""
 "Rhowch rif degol dilydd gyda o fwyaf %s lleoedd degol, os gwelwch yn dda."
 
-#: core/validators.py:362
+#: core/validators.py:438
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "Sicrhewch bod yr ffeil a llwythwyd yn o leiaf %s beit."
 
-#: core/validators.py:363
+#: core/validators.py:439
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "Sicrhewch bod yr ffeil a llwythwyd yn %s beit o fwyaf."
 
-#: core/validators.py:376
+#: core/validators.py:456
 msgid "The format for this field is wrong."
 msgstr "Mae'r fformat i'r faes yma yn anghywir."
 
-#: core/validators.py:391
+#: core/validators.py:471
 msgid "This field is invalid."
 msgstr "Mae'r faes yma yn annilydd."
 
-#: core/validators.py:426
+#: core/validators.py:507
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Ni gellir adalw unrhywbeth o %s."
 
-#: core/validators.py:429
+#: core/validators.py:510
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 "Dychwelodd yr URL %(url)s y pennawd Content-Type annilys '%(contenttype)s'."
 
-#: core/validators.py:462
+#: core/validators.py:543
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -1826,7 +2415,7 @@ msgstr ""
 "Caewch y tag anghaedig %(tag)s o linell %(line)s. (Linell yn ddechrau â \"%"
 "(start)s\".)"
 
-#: core/validators.py:466
+#: core/validators.py:547
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -1835,7 +2424,7 @@ msgstr ""
 "Ni chaniateir rhai o'r destun ar linell %(line)s yn y gyd-destun yna. "
 "(Linell yn ddechrau â \"%(start)s\".)"
 
-#: core/validators.py:471
+#: core/validators.py:552
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -1844,7 +2433,7 @@ msgstr ""
 "Mae \"%(attr)s\" ar lein %(line)s yn priodoledd annilydd. (Linell yn "
 "ddechrau â \"%(start)s\".)"
 
-#: core/validators.py:476
+#: core/validators.py:557
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -1853,7 +2442,7 @@ msgstr ""
 "Mae \"<%(tag)s>\" ar lein %(line)s yn tag annilydd. (Linell yn ddechrau â \"%"
 "(start)s\".)"
 
-#: core/validators.py:480
+#: core/validators.py:561
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -1862,7 +2451,7 @@ msgstr ""
 "Mae tag ar lein %(line)s yn eisiau un new fwy priodoleddau gofynnol. (Linell "
 "yn ddechrau â \"%(start)s\".)"
 
-#: core/validators.py:485
+#: core/validators.py:566
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -1871,101 +2460,12 @@ msgstr ""
 "Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell "
 "yn ddechrau â \"%(start)s\".)"
 
-#: db/models/manipulators.py:302
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
-msgstr ""
+#~ msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+#~ msgstr ""
+#~ "Ydych wedi <a href=\"/password_reset/\">anghofio eich cyfrinair</a>?"
 
-#: db/models/fields/__init__.py:40
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr ""
-
-#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:553
-#: forms/__init__.py:346
-msgid "This field is required."
-msgstr "Mae angen y faes yma."
-
-#: db/models/fields/__init__.py:337
-#, fuzzy
-msgid "This value must be an integer."
-msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
-
-#: db/models/fields/__init__.py:369
-#, fuzzy
-msgid "This value must be either True or False."
-msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
-
-#: db/models/fields/__init__.py:385
-#, fuzzy
-msgid "This field cannot be null."
-msgstr "Mae'r faes yma yn annilydd."
-
-#: db/models/fields/__init__.py:562
-msgid "Enter a valid filename."
-msgstr "Rhowch enw ffeil dilys."
-
-#: db/models/fields/related.py:43
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Rhowch %s dilys, os gwelwch yn dda."
-
-#: db/models/fields/related.py:579
-#, fuzzy
-msgid "Separate multiple IDs with commas."
-msgstr " Gwahanwch mwy nag un ID gyda atalnodau."
-
-#: db/models/fields/related.py:581
-#, fuzzy
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
-"Gafaelwch lawr \"Control\", neu \"Command\" ar Fac, i ddewis mwy nag un."
-
-#: db/models/fields/related.py:625
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural ""
-"Please enter valid %(self)s IDs. The values %(value)r are invalid."
-msgstr[0] ""
-msgstr[1] ""
-
-#: forms/__init__.py:380
-#, python-format
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: forms/__init__.py:385
-msgid "Line breaks are not allowed here."
-msgstr "Ni chaniateir toriadau llinell yma."
-
-#: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589
-#, python-format
-msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr "Dewisiwch dewis dilys; dydy '%(data)s' dim mewn %(choices)s."
-
-#: forms/__init__.py:645
-msgid "The submitted file is empty."
-msgstr "Mae'r ffeil yn wag."
-
-#: forms/__init__.py:699
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Rhowch rhif cyfan rhwng -32,768 a 32,767."
-
-#: forms/__init__.py:708
-msgid "Enter a positive number."
-msgstr "Rhowch rhif positif."
-
-#: forms/__init__.py:717
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "Rhowch rhif cyfan rhwng 0 a 32,767."
-
-#: template/defaultfilters.py:379
-msgid "yes,no,maybe"
-msgstr "ie,na,efallai"
+#~ msgid "Use '[algo]$[salt]$[hexdigest]'"
+#~ msgstr "Defnyddiwch '[algo]$[salt]$[hexdigest]'"
 
 #~ msgid "Comment"
 #~ msgstr "Sylw"
diff --git a/django/contrib/admin/views/doc.py b/django/contrib/admin/views/doc.py
index 4b592acebd..6adfb57c92 100644
--- a/django/contrib/admin/views/doc.py
+++ b/django/contrib/admin/views/doc.py
@@ -168,7 +168,7 @@ def model_detail(request, app_label, model_name):
             model = m
             break
     if model is None:
-        raise Http404, _("Model %r not found in app %r") % (model_name, app_label)
+        raise Http404, _("Model %(name)r not found in app %(label)r") % {'name': model_name, 'label': app_label}
 
     opts = model._meta
 
@@ -180,7 +180,7 @@ def model_detail(request, app_label, model_name):
         if isinstance(field, models.ForeignKey):
             data_type = related_object_name = field.rel.to.__name__
             app_label = field.rel.to._meta.app_label
-            verbose = utils.parse_rst((_("the related `%s.%s` object")  % (app_label, data_type)), 'model', _('model:') + data_type)
+            verbose = utils.parse_rst((_("the related `%(label)s.%(type)s` object")  % {'label': app_label, 'type': data_type}), 'model', _('model:') + data_type)
         else:
             data_type = get_readable_field_data_type(field)
             verbose = field.verbose_name
@@ -211,7 +211,7 @@ def model_detail(request, app_label, model_name):
 
     # Gather related objects
     for rel in opts.get_all_related_objects():
-        verbose = _("related `%s.%s` objects") % (rel.opts.app_label, rel.opts.object_name)
+        verbose = _("related `%(label)s.%(name)s` objects") % {'label': rel.opts.app_label, 'name': rel.opts.object_name}
         accessor = rel.get_accessor_name()
         fields.append({
             'name'      : "%s.all" % accessor,
diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py
index b2d28a0ab4..a399e7eef1 100644
--- a/django/contrib/humanize/templatetags/humanize.py
+++ b/django/contrib/humanize/templatetags/humanize.py
@@ -1,3 +1,5 @@
+from django.utils.translation import ngettext
+from django.utils.translation import gettext_lazy as _
 from django import template
 import re
 
@@ -12,9 +14,9 @@ def ordinal(value):
         value = int(value)
     except ValueError:
         return value
-    t = ('th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th')
+    t = (_('th'), _('st'), _('nd'), _('rd'), _('th'), _('th'), _('th'), _('th'), _('th'), _('th'))
     if value % 100 in (11, 12, 13): # special case
-        return '%dth' % value
+        return "%d%s" % (value, t[0])
     return '%d%s' % (value, t[value % 10])
 register.filter(ordinal)
 
@@ -41,11 +43,14 @@ def intword(value):
     if value < 1000000:
         return value
     if value < 1000000000:
-        return '%.1f million' % (value / 1000000.0)
+    	new_value = value / 1000000.0
+        return ngettext('%(value).1f million', '%(value).1f million', new_value) % {'value': new_value}
     if value < 1000000000000:
-        return '%.1f billion' % (value / 1000000000.0)
+        new_value = value / 1000000000.0
+        return ngettext('%(value).1f billion', '%(value).1f billion', new_value) % {'value': new_value}
     if value < 1000000000000000:
-        return '%.1f trillion' % (value / 1000000000000.0)
+        new_value = value / 1000000000000.0
+        return ngettext('%(value).1f trillion', '%(value).1f trillion', new_value) % {'value': new_value}
     return value
 register.filter(intword)
 
@@ -60,5 +65,5 @@ def apnumber(value):
         return value
     if not 0 < value < 10:
         return value
-    return ('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine')[value-1]
+    return (_('one'), _('two'), _('three'), _('four'), _('five'), _('six'), _('seven'), _('eight'), _('nine'))[value-1]
 register.filter(apnumber)
diff --git a/django/core/validators.py b/django/core/validators.py
index 6985228a00..bd7d790e04 100644
--- a/django/core/validators.py
+++ b/django/core/validators.py
@@ -364,7 +364,7 @@ class NumberIsInRange(object):
         self.lower, self.upper = lower, upper
         if not error_message:
             if lower and upper:
-                self.error_message = gettext("This value must be between %s and %s.") % (lower, upper)
+                 self.error_message = gettext("This value must be between %(lower)s and %(upper)s.") % {'lower': lower, 'upper': upper}
             elif lower:
                 self.error_message = gettext("This value must be at least %s.") % lower
             elif upper: