Merged to trunk r1137

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1139 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/conf/global_settings.py

@@ -35,6 +35,7 @@ LANGUAGE_CODE = 'en-us'
 # should be the utf-8 encoded local name for the language.
 LANGUAGES = (
     ('cs', _('Czech')),
+    ('cy', _('Welsh')),
     ('de', _('German')),
     ('en', _('English')),
     ('es', _('Spanish')),
@@ -43,10 +44,11 @@ LANGUAGES = (
     ('it', _('Italian')),
     ('no', _('Norwegian')),
     ('pt-br', _('Brazilian')),
+    ('ro', _('Romanian')),
     ('ru', _('Russian')),
+    ('sk', _('Slovak')),
     ('sr', _('Serbian')),
     ('zh-cn', _('Simplified Chinese')),
-    ('sk', _('Slovak')),
 )
 
 # Not-necessarily-technical managers of the site. They get broken link

django/conf/locale/cs/LC_MESSAGES/django.po

@@ -240,8 +240,8 @@ msgstr "Django správa webu"
 msgid "Django administration"
 msgstr "Django správa"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -369,18 +369,26 @@ msgstr ""
 "Mazání %(object_name)s  '%(object)s' by vyústilo ve vymazání souvisejících "
 "objektů, ale Váš účet nemá oprávnění pro mazání následujících typů objektů:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
+msgstr "Chyba serveru (500)"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny "
-"následující související položky budou smazány:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
-msgstr "Ano, jsem si jist"
+msgstr "Chyba serveru <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 ""
+"Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a "
+"měla by být brzy odstraněna. Děkujeme za trpělivost."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Stránka nenalezena"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -421,6 +429,33 @@ msgstr ""
 msgid "Save"
 msgstr "aktivní"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odhlásit se"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, 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 ""
+"Mazání %(object_name)s  '%(object)s' by vyústilo ve vymazání souvisejících "
+"objektů, ale Váš účet nemá oprávnění pro mazání následujících typů objektů:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny "
+"následující související položky budou smazány:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Ano, jsem si jist"
+
 #: 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
@@ -911,6 +946,10 @@ msgstr "Zpráva"
 msgid "Czech"
 msgstr "Česky"
 
+#: conf/global_settings.py:38
+msgid "Welsh"
+msgstr ""
+
 #: conf/global_settings.py:38
 msgid "German"
 msgstr "Německy"

django/conf/locale/cy/LC_MESSAGES/django.po

@@ -0,0 +1,990 @@
+# Translation of Django to Welsh.
+# Copyright (C) 2005 Django.
+# This file is distributed under the same license as the Django package.
+# Jason Davies <jason@jasondavies.com>, 2005.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-11-09 04:27-0600\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "amser gweithred"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id gwrthrych"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr gwrthrych"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "fflag gweithred"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "neges newid"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "cofnod"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "cofnodion"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
+#: 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
+msgid "Home"
+msgstr "Adref"
+
+#: contrib/admin/templates/admin/object_history.html:5
+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 models/auth.py:47
+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:27
+msgid "Add"
+msgstr "Ychwanegu"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Newidio"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Does genych ddim hawl i olygu unrhywbeth."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Gweithredau Diweddar"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Fy Ngweithredau"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Dim ar gael"
+
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Enw defnyddiwr:"
+
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Cyfrinair:"
+
+#: contrib/admin/templates/admin/login.html:20
+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/login.html:24
+msgid "Log in"
+msgstr "Mewngofnodi"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Croeso,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Newid cyfrinair"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Allgofnodi"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, 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:14
+#, 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:18
+msgid "Yes, I'm sure"
+msgstr "Yndw, rwy'n sicr"
+
+#: 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_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
+#, 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"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Dydd Llun"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Dydd Mawrth"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Dydd Mercher"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Dydd Iau"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Dydd Gwener"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Dydd Sadwrn"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Dydd Sul"
+
+#: utils/dates.py:14
+msgid "January"
+msgstr "Ionawr"
+
+#: utils/dates.py:14
+msgid "February"
+msgstr "Chwefror"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "March"
+msgstr "Mawrth"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "April"
+msgstr "Ebrill"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "May"
+msgstr "Mai"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "June"
+msgstr "Mehefin"
+
+#: utils/dates.py:15 utils/dates.py:27
+msgid "July"
+msgstr "Gorffenaf"
+
+#: utils/dates.py:15
+msgid "August"
+msgstr "Awst"
+
+#: utils/dates.py:15
+msgid "September"
+msgstr "Medi"
+
+#: utils/dates.py:15
+msgid "October"
+msgstr "Hydref"
+
+#: utils/dates.py:15
+msgid "November"
+msgstr "Tachwedd"
+
+#: utils/dates.py:16
+msgid "December"
+msgstr "Rhagfyr"
+
+#: utils/dates.py:27
+msgid "Jan."
+msgstr "Ion."
+
+#: utils/dates.py:27
+msgid "Feb."
+msgstr "Chwe."
+
+#: utils/dates.py:28
+msgid "Aug."
+msgstr "Awst"
+
+#: utils/dates.py:28
+msgid "Sept."
+msgstr "Medi"
+
+#: utils/dates.py:28
+msgid "Oct."
+msgstr "Hyd."
+
+#: utils/dates.py:28
+msgid "Nov."
+msgstr "Tach."
+
+#: utils/dates.py:28
+msgid "Dec."
+msgstr "Rhag."
+
+#: models/core.py:7
+msgid "domain name"
+msgstr "parth-enw"
+
+#: models/core.py:8
+msgid "display name"
+msgstr "enw arddangos"
+
+#: models/core.py:10
+msgid "site"
+msgstr "safle"
+
+#: models/core.py:11
+msgid "sites"
+msgstr "safleoedd"
+
+#: models/core.py:28
+msgid "label"
+msgstr "label"
+
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
+msgid "name"
+msgstr "enw"
+
+#: models/core.py:31
+msgid "package"
+msgstr "pecyn"
+
+#: models/core.py:32
+msgid "packages"
+msgstr "pecynau"
+
+#: models/core.py:42
+msgid "python module name"
+msgstr "enw modwl python"
+
+#: models/core.py:44
+msgid "content type"
+msgstr "math cynnwys"
+
+#: models/core.py:45
+msgid "content types"
+msgstr "mathau cynnwys"
+
+#: models/core.py:68
+msgid "redirect from"
+msgstr "ailgyfeirio o"
+
+#: models/core.py:69
+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/'."
+
+#: models/core.py:70
+msgid "redirect to"
+msgstr "ailgyfeirio i"
+
+#: models/core.py:71
+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://'."
+
+#: models/core.py:73
+msgid "redirect"
+msgstr "ailgyfeiriad"
+
+#: models/core.py:74
+msgid "redirects"
+msgstr "ailgyfeiriadau"
+
+#: models/core.py:87
+msgid "URL"
+msgstr "URL"
+
+#: models/core.py:88
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Er enghraifft: '/amdan/cyswllt/'. Sicrhewch gennych slaesau arweiniol ac "
+"trywyddiol."
+
+#: models/core.py:89
+msgid "title"
+msgstr "teitl"
+
+#: models/core.py:90
+msgid "content"
+msgstr "cynnwys"
+
+#: models/core.py:91
+msgid "enable comments"
+msgstr "galluogi sylwadau"
+
+#: models/core.py:92
+msgid "template name"
+msgstr "enw'r templed"
+
+#: models/core.py:93
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
+"Er enghraifft: 'flatfiles/tudalen_cyswllt'. Os nid darparwyd, ddefnyddia'r "
+"system 'flatfiles/default'."
+
+#: models/core.py:94
+msgid "registration required"
+msgstr "cofrestriad gofynnol"
+
+#: models/core.py:94
+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."
+
+#: models/core.py:98
+msgid "flat page"
+msgstr "tudalen fflat"
+
+#: models/core.py:99
+msgid "flat pages"
+msgstr "tudalennau fflat"
+
+#: models/core.py:117
+msgid "session key"
+msgstr "goriad sesiwn"
+
+#: models/core.py:118
+msgid "session data"
+msgstr "data sesiwn"
+
+#: models/core.py:119
+msgid "expire date"
+msgstr "dyddiad darfod"
+
+#: models/core.py:121
+msgid "session"
+msgstr "sesiwn"
+
+#: models/core.py:122
+msgid "sessions"
+msgstr "sesiynau"
+
+#: models/auth.py:8
+msgid "codename"
+msgstr "enw arwyddol"
+
+#: models/auth.py:10
+msgid "Permission"
+msgstr "Hawl"
+
+#: models/auth.py:11 models/auth.py:58
+msgid "Permissions"
+msgstr "Hawliau"
+
+#: models/auth.py:22
+msgid "Group"
+msgstr "Grŵp"
+
+#: models/auth.py:23 models/auth.py:60
+msgid "Groups"
+msgstr "Grwpiau"
+
+#: models/auth.py:33
+msgid "username"
+msgstr "enw defnyddiwr"
+
+#: models/auth.py:34
+msgid "first name"
+msgstr "enw cyntaf"
+
+#: models/auth.py:35
+msgid "last name"
+msgstr "enw olaf"
+
+#: models/auth.py:36
+msgid "e-mail address"
+msgstr "cyfeiriad e-bost"
+
+#: models/auth.py:37
+msgid "password"
+msgstr "cyfrinair"
+
+#: models/auth.py:37
+msgid "Use an MD5 hash -- not the raw password."
+msgstr "Defnyddiwch stwnsh MD5 -- nid y gyfrinair crai."
+
+#: models/auth.py:38
+msgid "staff status"
+msgstr "statws staff"
+
+#: models/auth.py:38
+msgid "Designates whether the user can log into this admin site."
+msgstr "Dylunio ai'r defnyddiwr yn gally mewngofnodi i'r safle weinyddiad yma."
+
+#: models/auth.py:39
+msgid "active"
+msgstr "gweithredol"
+
+#: models/auth.py:40
+msgid "superuser status"
+msgstr "statws defnyddiwr swper"
+
+#: models/auth.py:41
+msgid "last login"
+msgstr "mewngofnod olaf"
+
+#: models/auth.py:42
+msgid "date joined"
+msgstr "Dyddiad"
+
+#: models/auth.py:44
+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."
+
+#: models/auth.py:48
+msgid "Users"
+msgstr "Defnyddwyr"
+
+#: models/auth.py:57
+msgid "Personal info"
+msgstr "Gwybodaeth personol"
+
+#: models/auth.py:59
+msgid "Important dates"
+msgstr "Dyddiadau pwysig"
+
+#: models/auth.py:182
+msgid "Message"
+msgstr "Neges"
+
+#: conf/global_settings.py:36
+msgid "Czech"
+msgstr "Tsieceg"
+
+#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr "Cymraeg"
+
+#: conf/global_settings.py:38
+msgid "German"
+msgstr "Almaeneg"
+
+#: conf/global_settings.py:39
+msgid "English"
+msgstr "Saesneg"
+
+#: conf/global_settings.py:40
+msgid "Spanish"
+msgstr "Spaeneg"
+
+#: conf/global_settings.py:41
+msgid "French"
+msgstr "Ffrangeg"
+
+#: conf/global_settings.py:42
+msgid "Galician"
+msgstr "Galisieg"
+
+#: conf/global_settings.py:43
+msgid "Italian"
+msgstr "Eidaleg"
+
+#: conf/global_settings.py:44
+msgid "Norwegian"
+msgstr "Norwyeg"
+
+#: conf/global_settings.py:45
+msgid "Brazilian"
+msgstr "Brasileg"
+
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
+msgid "Russian"
+msgstr "Rwsieg"
+
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Serbian"
+msgstr "Serbeg"
+
+#: conf/global_settings.py:50
+msgid "Simplified Chinese"
+msgstr "Tsieinëeg Symledig"
+
+#: core/validators.py:59
+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:63
+#, fuzzy
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr ""
+"Rhaid i'r werth yma cynnwys lythrennau, rhifau, tanlinellau ac slaesau yn "
+"unig."
+
+#: core/validators.py:71
+msgid "Uppercase letters are not allowed here."
+msgstr "Ni chaniateir priflythrennau yma."
+
+#: core/validators.py:75
+msgid "Lowercase letters are not allowed here."
+msgstr "Ni chaniateir lythrennau bach yma."
+
+#: core/validators.py:82
+msgid "Enter only digits separated by commas."
+msgstr "Rhowch digidau gwahanu gyda atalnodau yn unig."
+
+#: core/validators.py:94
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Rhowch cyfeiriad e-bost dilys gwahanu gyda atalnodau."
+
+#: core/validators.py:98
+msgid "Please enter a valid IP address."
+msgstr "Rhowch cyfeiriad IP dilys, os gwelwch yn dda."
+
+#: core/validators.py:102
+msgid "Empty values are not allowed here."
+msgstr "Ni chaniateir gwerthau gwag yma."
+
+#: core/validators.py:106
+msgid "Non-numeric characters aren't allowed here."
+msgstr "Ni chaniateir nodau anrhifol yma."
+
+#: core/validators.py:110
+msgid "This value can't be comprised solely of digits."
+msgstr "Ni gellir y werth yma"
+
+#: core/validators.py:115
+msgid "Enter a whole number."
+msgstr "Rhowch rhif cyfan."
+
+#: core/validators.py:119
+msgid "Only alphabetical characters are allowed here."
+msgstr "Caniateir nodau gwyddorol un unig yma."
+
+#: core/validators.py:123
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Rhowch dyddiad dilys mewn fformat YYYY-MM-DD."
+
+#: core/validators.py:127
+msgid "Enter a valid time in HH:MM format."
+msgstr "Rhowch amser ddilys mewn fformat HH:MM."
+
+#: core/validators.py:131
+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:135
+msgid "Enter a valid e-mail address."
+msgstr "Rhowch cyfeiriad e-bost ddilys."
+
+#: core/validators.py:147
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Llwythwch delwedd dilys. Doedd y delwedd a llwythwyd dim yn ddelwedd dilys, "
+"neu roedd o'n ddelwedd llwgr."
+
+#: core/validators.py:154
+#, 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:158
+#, 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:166
+#, 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:170
+msgid "A valid URL is required."
+msgstr "Mae URL dilys yn ofynnol."
+
+#: core/validators.py:184
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"Mae HTML dilys yn ofynnol. Gwallau penodol yw:\n"
+"%s"
+
+#: core/validators.py:191
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "XML wedi ffurfio'n wael: %s"
+
+#: core/validators.py:201
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "URL annilys: %s"
+
+#: core/validators.py:203
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "Mae'r URL %s yn gyswllt toredig."
+
+#: core/validators.py:209
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Rhowch talfyriad dalaith U.S. dilys."
+
+#: core/validators.py:224
+#, 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:231
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "Rhaid i'r faes yma cydweddu'r faes '%s'."
+
+#: core/validators.py:250
+msgid "Please enter something for at least one field."
+msgstr "Rhowch rhywbeth am un maes o leiaf, os gwelwch yn dda."
+
+#: core/validators.py:259 core/validators.py:270
+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:277
+#, 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:289
+#, 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:308
+msgid "Duplicate values are not allowed."
+msgstr "Ni chaniateir gwerthau ddyblyg."
+
+#: core/validators.py:331
+#, 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:342
+msgid "Please enter a valid decimal number."
+msgstr "Rhowch rhif degol dilys, os gwelwch yn dda."
+
+#: core/validators.py:344
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total 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:347
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+"Rhowch rif degol dilydd gyda o fwyaf %s lle degol, os gwelwch yn dda."
+msgstr[1] ""
+"Rhowch rif degol dilydd gyda o fwyaf %s lleoedd degol, os gwelwch yn dda."
+
+#: core/validators.py:357
+#, 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:358
+#, 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:371
+msgid "The format for this field is wrong."
+msgstr "Mae'r fformat i'r faes yma yn anghywir."
+
+#: core/validators.py:386
+msgid "This field is invalid."
+msgstr "Mae'r faes yma yn annilydd."
+
+#: core/validators.py:421
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "Ni gellir adalw unrhywbeth o %s."
+
+#: core/validators.py:424
+#, 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:457
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Caewch y tag anghaedig %(tag)s o linell %(line)s. (Linell yn ddechrau â \"%"
+"(start)s\".)"
+
+#: core/validators.py:461
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Ni chaniateir rhai o'r destun ar linell %(line)s yn y gyd-destun yna. "
+"(Linell yn ddechrau â \"%(start)s\".)"
+
+#: core/validators.py:466
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"Mae \"%(attr)s\" ar lein %(line)s yn priodoledd annilydd. (Linell yn "
+"ddechrau â \"%(start)s\".)"
+
+#: core/validators.py:471
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"Mae \"<%(tag)s>\" ar lein %(line)s yn tag annilydd. (Linell yn ddechrau â \"%"
+"(start)s\".)"
+
+#: core/validators.py:475
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Mae tag ar lein %(line)s yn eisiau un new fwy priodoleddau gofynnol. (Linell "
+"yn ddechrau â \"%(start)s\".)"
+
+#: core/validators.py:480
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell "
+"yn ddechrau â \"%(start)s\".)"
+
+#: core/meta/fields.py:95
+msgid " Separate multiple IDs with commas."
+msgstr " Gwahanwch mwy nag un ID gyda atalnodau."
+
+#: core/meta/fields.py:98
+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."

django/conf/locale/de/LC_MESSAGES/django.po

@@ -239,8 +239,8 @@ msgstr "Django Systemverwaltung"
 msgid "Django administration"
 msgstr "Django Verwaltung"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -362,26 +362,22 @@ msgstr "Abmelden"
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
 msgid ""
-"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"There's been an error. It's been reported to the site administrators via e-"
-"objects, but your account doesn't have permission to delete the following "
+"mail and should be fixed shortly. Thanks for your patience."
-"types of objects:"
 msgstr ""
-"Die Löschung des %(object_name)s '%(object)s' hätte die Löschung von "
+"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per "
-"abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die "
+"eMail weitergegeben und sollte bald behoben sein. Vielen Dank für Ihr "
-"folgenden abhängigen Daten zu löschen:"
+"Verständnis."
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/404.html:4
-#, python-format
+#: contrib/admin/templates/admin/404.html:8
-msgid ""
+msgid "Page not found"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+msgstr "Seite nicht gefunden"
-"the following related items will be deleted:"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
 msgstr ""
-"Sind Sie sicher, das Sie %(object_name)s \"%(object)s\" löschen wollen? Es "
+"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden."
-"werden zusätzlich die folgenden abhängigen Daten mit gelöscht:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Ja, ich bin sicher"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -421,6 +417,34 @@ msgstr "Sichern und weiter bearbeiten"
 msgid "Save"
 msgstr "Sichern"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Abmelden"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, 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 ""
+"Die Löschung des %(object_name)s '%(object)s' hätte die Löschung von "
+"abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die "
+"folgenden abhängigen Daten zu löschen:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"Sind Sie sicher, das Sie %(object_name)s \"%(object)s\" löschen wollen? Es "
+"werden zusätzlich die folgenden abhängigen Daten mit gelöscht:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Ja, ich bin sicher"
+
 #: 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
@@ -912,6 +936,10 @@ msgstr "Mitteilung"
 msgid "Czech"
 msgstr "Tschechisch"
 
+#: conf/global_settings.py:38
+msgid "Welsh"
+msgstr "Walisisch"
+
 #: conf/global_settings.py:38
 msgid "German"
 msgstr "Deutsch"

django/conf/locale/en/LC_MESSAGES/django.po

@@ -243,22 +243,19 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
+
+#: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
+#: contrib/admin/templates/admin/base.html:29
-msgstr ""
+#: contrib/admin/templates/registration/password_change_done.html:4
-
+#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/admin/500.html:6
+#: contrib/admin/templates/registration/logged_out.html:4
-msgid "Server error (500)"
+#: contrib/admin/templates/registration/password_reset_done.html:4
-msgstr ""
+#: contrib/admin/templates/registration/password_change_form.html:4
-
+msgid "Home"
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr ""
-
-#: 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 ""
 
 #: contrib/admin/templates/admin/404.html:4
@@ -354,15 +351,23 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
+msgstr ""
+
+#: 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 ""
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
 msgstr ""
 
 #: contrib/admin/templates/admin/change_form.html:20
@@ -403,6 +408,29 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr ""
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, 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 ""
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr ""
+
 #: 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
@@ -877,53 +905,61 @@ msgid "Czech"
 msgstr ""
 
 #: conf/global_settings.py:38
-msgid "German"
+msgid "Welsh"
 msgstr ""
 
 #: conf/global_settings.py:39
-msgid "English"
+msgid "German"
 msgstr ""
 
 #: conf/global_settings.py:40
-msgid "Spanish"
+msgid "English"
 msgstr ""
 
 #: conf/global_settings.py:41
-msgid "French"
+msgid "Spanish"
 msgstr ""
 
 #: conf/global_settings.py:42
-msgid "Galician"
+msgid "French"
 msgstr ""
 
 #: conf/global_settings.py:43
-msgid "Italian"
+msgid "Galician"
 msgstr ""
 
 #: conf/global_settings.py:44
-msgid "Norwegian"
+msgid "Italian"
 msgstr ""
 
 #: conf/global_settings.py:45
-msgid "Brazilian"
+msgid "Norwegian"
 msgstr ""
 
 #: conf/global_settings.py:46
-msgid "Russian"
+msgid "Brazilian"
 msgstr ""
 
 #: conf/global_settings.py:47
-msgid "Serbian"
+msgid "Romanian"
 msgstr ""
 
 #: conf/global_settings.py:48
-msgid "Simplified Chinese"
+msgid "Russian"
 msgstr ""
 
 #: conf/global_settings.py:49
 msgid "Slovak"
 msgstr ""
 
+#: conf/global_settings.py:49
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:50
+msgid "Simplified Chinese"
+msgstr ""
+
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
 msgstr ""

django/conf/locale/es/LC_MESSAGES/django.po

@@ -236,8 +236,8 @@ msgstr "Sitio de administraci
 msgid "Django administration"
 msgstr "Administración de Django"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -368,18 +368,27 @@ msgstr ""
 "objetos relacionados, pero su cuenta no tiene permiso para borrar los "
 "siguientes tipos de objetos:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
+msgstr "Error del servidor (500)"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"¿Está seguro de que quiere borrar los %(object_name)s \"%(object)s\"? Se "
-"borrarán los siguientes objetos relacionados:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
-msgstr "Sí, estoy seguro"
+msgstr "Error de servidor <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 ""
+"Ha ocurrido un error. Se ha informado a los administradores del sitio "
+"mediante correo electrónico y debería arreglarse en breve. Gracias por su "
+"paciencia"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Página no encontrada"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -419,6 +428,34 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Terminar"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, 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 ""
+"Eliminar el %(object_name)s '%(object)s' provocaría la eliminación de "
+"objetos relacionados, pero su cuenta no tiene permiso para borrar los "
+"siguientes tipos de objetos:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"¿Está seguro de que quiere borrar los %(object_name)s \"%(object)s\"? Se "
+"borrarán los siguientes objetos relacionados:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Sí, estoy seguro"
+
 #: 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
@@ -905,53 +942,61 @@ msgid "Czech"
 msgstr ""
 
 #: conf/global_settings.py:38
-msgid "German"
+msgid "Welsh"
 msgstr ""
 
 #: conf/global_settings.py:39
-msgid "English"
+msgid "German"
 msgstr ""
 
 #: conf/global_settings.py:40
-msgid "Spanish"
+msgid "English"
 msgstr ""
 
 #: conf/global_settings.py:41
-msgid "French"
+msgid "Spanish"
 msgstr ""
 
 #: conf/global_settings.py:42
-msgid "Galician"
+msgid "French"
 msgstr ""
 
 #: conf/global_settings.py:43
-msgid "Italian"
+msgid "Galician"
 msgstr ""
 
 #: conf/global_settings.py:44
-msgid "Norwegian"
+msgid "Italian"
 msgstr ""
 
 #: conf/global_settings.py:45
-msgid "Brazilian"
+msgid "Norwegian"
 msgstr ""
 
 #: conf/global_settings.py:46
-msgid "Russian"
+msgid "Brazilian"
 msgstr ""
 
 #: conf/global_settings.py:47
-msgid "Serbian"
+msgid "Romanian"
 msgstr ""
 
 #: conf/global_settings.py:48
-msgid "Simplified Chinese"
+msgid "Russian"
 msgstr ""
 
 #: conf/global_settings.py:49
 msgid "Slovak"
 msgstr ""
 
+#: conf/global_settings.py:49
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:50
+msgid "Simplified Chinese"
+msgstr ""
+
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Este valor debe contener sólo letras, números y guión bajo."

django/conf/locale/fr/LC_MESSAGES/django.po

@@ -236,8 +236,8 @@ msgstr "Site d'administration de Django"
 msgid "Django administration"
 msgstr "Administration de Django"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -368,18 +368,27 @@ msgstr ""
 "objets qui lui sont liés mais votre compte ne possède pas la permission de "
 "supprimer les types d'objets suivants:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
+msgstr "Erreur du serveur (500)"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"Êtes vous certain de vouloir supprimer %(object_name)s \"%(object)s\"? Tous "
-"les éléments liés suivants seront supprimés:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
-msgstr "Oui, je suis certain"
+msgstr "Erreur du serveur <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 ""
+"Une erreur est survenue. Elle a été transmise par courriel aux "
+"administrateurs du site et sera corrigée dans les meilleurs délais. Merci "
+"pour votre patience."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Cette page n'a pas été trouvée"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -420,6 +429,34 @@ msgstr ""
 msgid "Save"
 msgstr "actif"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Déconnection"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, 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 ""
+"Supprimer %(object_name)s '%(object)s' provoquerait la suppression des "
+"objets qui lui sont liés mais votre compte ne possède pas la permission de "
+"supprimer les types d'objets suivants:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"Êtes vous certain de vouloir supprimer %(object_name)s \"%(object)s\"? Tous "
+"les éléments liés suivants seront supprimés:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Oui, je suis certain"
+
 #: 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
@@ -915,6 +952,10 @@ msgstr "Message"
 msgid "Czech"
 msgstr "Tchèque"
 
+#: conf/global_settings.py:38
+msgid "Welsh"
+msgstr ""
+
 #: conf/global_settings.py:38
 msgid "German"
 msgstr "Allemand"

django/conf/locale/it/LC_MESSAGES/django.po

@@ -237,8 +237,8 @@ msgstr "Amministrazione sito Django"
 msgid "Django administration"
 msgstr "Amministrazione Django"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -368,18 +368,26 @@ msgstr ""
 "degli oggetti relazionati, ma il tuo account non ha i permessi per rimuovere "
 "i seguenti tipi di oggetti:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
+msgstr "Errore del server (500)"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"Sei sicuro di voler rimuovere %(object_name)s \"%(object)s\"? I seguenti "
-"oggetti relazionati saranno rimossi:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
-msgstr "Sì, sono sicuro"
+msgstr "Errore del Server <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 ""
+"C'è stato un errore. E' stato riportato agli amministratori del sito via e-"
+"mail e verrà risolto a breve. Grazie per la pazienza."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Pagina non trovata"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -420,6 +428,34 @@ msgstr ""
 msgid "Save"
 msgstr "attivo"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Esci"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, 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 ""
+"La rimozione di %(object_name)s '%(object)s' causerebbe la cancellazione "
+"degli oggetti relazionati, ma il tuo account non ha i permessi per rimuovere "
+"i seguenti tipi di oggetti:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"Sei sicuro di voler rimuovere %(object_name)s \"%(object)s\"? I seguenti "
+"oggetti relazionati saranno rimossi:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Sì, sono sicuro"
+
 #: 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
@@ -908,6 +944,10 @@ msgstr "Messaggio"
 msgid "Czech"
 msgstr ""
 
+#: conf/global_settings.py:38
+msgid "Welsh"
+msgstr ""
+
 #: conf/global_settings.py:38
 msgid "German"
 msgstr "Tedesco"

django/conf/locale/no/LC_MESSAGES/django.po

@@ -237,8 +237,8 @@ msgstr "Django administrasjonsside"
 msgid "Django administration"
 msgstr "Django administrasjon"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -366,18 +366,26 @@ msgstr ""
 "Vist du sletter %(object_name)s '%(object)s' vill du også slette relaterte "
 "objekter, men du har ikke tillatelse til å slette de følgende objektene:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
+msgstr "Tjener feil (500)"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"Er du sikker på at du vill slette %(object_name) \"%(object)s\"? Alle de "
-"følgende relaterte objektene vill bli slettet:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
-msgstr "Ja, jeg er sikker"
+msgstr "Tjener feil <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 ""
+"Det har vært en feil. Feilen er blitt rapportert til administrator via e-"
+"mail, og vill bli fikset snart. Takk for din tålmodighet."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Fant ikke siden"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -418,6 +426,33 @@ msgstr ""
 msgid "Save"
 msgstr "aktiv"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Log ut"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, 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 ""
+"Vist du sletter %(object_name)s '%(object)s' vill du også slette relaterte "
+"objekter, men du har ikke tillatelse til å slette de følgende objektene:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"Er du sikker på at du vill slette %(object_name) \"%(object)s\"? Alle de "
+"følgende relaterte objektene vill bli slettet:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Ja, jeg er sikker"
+
 #: 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
@@ -909,6 +944,10 @@ msgstr "Meldinger"
 msgid "Czech"
 msgstr "Tsjekkisk"
 
+#: conf/global_settings.py:38
+msgid "Welsh"
+msgstr ""
+
 #: conf/global_settings.py:38
 msgid "German"
 msgstr "Tysk"

django/conf/locale/pt_BR/LC_MESSAGES/django.po

@@ -237,8 +237,8 @@ msgstr "Site de administração do Django"
 msgid "Django administration"
 msgstr "Administração do Django"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -368,18 +368,26 @@ msgstr ""
 "objetos relacionados, mas sua conta não tem a permissão para remoção dos "
 "seguintes tipos de objetos:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
+msgstr "Erro no servidor (500)"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos os "
-"seguintes itens relacionados serão removidos:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
-msgstr "Sim, tenho certeza"
+msgstr "Erro no Servidor <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 ""
+"Houve um erro. Este foi reportado aos administradores do site através d e-"
+"mail e deve ser consertado em breve. Obrigado pela compreensão."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Página não encontrada"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -420,6 +428,34 @@ msgstr ""
 msgid "Save"
 msgstr "ativar"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Encerrar sessão"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, 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 ""
+"A remoção de '%(object)s' %(object_name)s pode resultar na remoção de "
+"objetos relacionados, mas sua conta não tem a permissão para remoção dos "
+"seguintes tipos de objetos:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos os "
+"seguintes itens relacionados serão removidos:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Sim, tenho certeza"
+
 #: 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
@@ -912,6 +948,10 @@ msgstr "Mensagem"
 msgid "Czech"
 msgstr "Tcheco"
 
+#: conf/global_settings.py:38
+msgid "Welsh"
+msgstr ""
+
 #: conf/global_settings.py:38
 msgid "German"
 msgstr "Alemão"

django/conf/locale/ro/LC_MESSAGES/django.po

@@ -0,0 +1,994 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <tibimicu@gmx.net>, 2005.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Django \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-11-09 11:26+0100\n"
+"PO-Revision-Date: 2005-11-08 19:06+GMT+2\n"
+"Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "timp acţiune"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id obiect"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr obiect"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "steguleţ acţiune"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "schimbă mesaj"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "intrare log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "intrări log"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
+#: 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
+msgid "Home"
+msgstr "Acasă"
+
+#: contrib/admin/templates/admin/object_history.html:5
+msgid "History"
+msgstr "Istoric"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "Dată/oră"
+
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
+msgid "User"
+msgstr "Utilizator"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "Acţiune"
+
+#: 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 ""
+"Acest obiect nu are un istoric al schimbărilor. Probabil nu a fost adăugat "
+"prinintermediul acestui sit de administrare."
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Administrare sit Django"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administrare Django"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Eroare de server"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Eroare de server (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Eroare server <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 ""
+"A apărut o eroare. Este raportată către administrator via emailşi va fi "
+"fixată în scurt timp. Mulţumim pentru înţelegere."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Pagină inexistentă"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Ne pare rău, dar pagina cerută nu există."
+
+#: contrib/admin/templates/admin/index.html:27
+msgid "Add"
+msgstr "Adaugă"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Schimbă"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nu ai drepturi de editare."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Acţiuni Recente"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Acţiunile Mele"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Indisponibil"
+
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Utilizator:"
+
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Parola:"
+
+#: contrib/admin/templates/admin/login.html:20
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr "Ai <a href=\"/password_reset/\">uitat parola</a>?"
+
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Login"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bine ai venit,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Schimbă parola"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Deautentificare"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, 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 ""
+"Ştergînd %(object_name)s '%(object)s' va avea ca rezultat ştergerea şi a "
+"obiectelor ce au legătură, dar contul tău nu are permisiunea de a şterge "
+"următoarele tipuri de obiecte:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"Eşti sigur că vrei să ştergi %(object_name)s \"%(object)s\"?Următoarele "
+"componente vor fi şterse:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Da, sînt sigur"
+
+#: 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 "Schimbă parola"
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr "Schimbare reuşită a parolei"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "Parola a fost schimbată."
+
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "Resetează parola"
+
+#: 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 ""
+"Ai uitat parola? Introdu adresa de email mai jos, iar noi vom reseta parola "
+"şi-ţi vom trimite una nouă prin email."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Adresa email:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Resetează-mi parola"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Mulţumesc pentru petrecerea folositoare a timpului cu saitul astăzi."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Relogare"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Parola resetată cu succes"
+
+#: 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 ""
+"Am trimis o nouă parolă prin email la adresa furnizată. Ar trebuisă o "
+"primeşti în scurt timp."
+
+#: 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 ""
+"Introdu te rog vechea parolă, pentru motive de siguranţă, şi apoi tastează "
+"noua parolă de două ori aşa încît putem verifica dacă ai tastat corect."
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "Vechea parolă:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "Noua parolă:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "Confirmă parola:"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "Schimbă-mi parola"
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Ai primit acest email pentru că ai cerut o resetare a parolei"
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "pentru contul tău la %(site_name)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr "Noua ta parolă este: %(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 "Poţi schmiba această parolă vizitînd această pagină:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "Numele tău utilizator, în caz că ai uitat:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "Mulţumesc pentru folosirea saitului nostru!"
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Echipa %(site_name)s"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Luni"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Marţi"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Miercuri"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Joi"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Vineri"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Sîmbătă"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Duminică"
+
+#: utils/dates.py:14
+msgid "January"
+msgstr "Ianuarie"
+
+#: utils/dates.py:14
+msgid "February"
+msgstr "Februarie"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "March"
+msgstr "Martie"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "April"
+msgstr "Aprilie"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "May"
+msgstr "Mai"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "June"
+msgstr "Iunie"
+
+#: utils/dates.py:15 utils/dates.py:27
+msgid "July"
+msgstr "Iulie"
+
+#: utils/dates.py:15
+msgid "August"
+msgstr "August"
+
+#: utils/dates.py:15
+msgid "September"
+msgstr "Septembrie"
+
+#: utils/dates.py:15
+msgid "October"
+msgstr "Octombrie"
+
+#: utils/dates.py:15
+msgid "November"
+msgstr "Noiembrie"
+
+#: utils/dates.py:16
+msgid "December"
+msgstr "Decembrie"
+
+#: utils/dates.py:27
+msgid "Jan."
+msgstr "Ian."
+
+#: utils/dates.py:27
+msgid "Feb."
+msgstr "Feb."
+
+#: utils/dates.py:28
+msgid "Aug."
+msgstr "Aug."
+
+#: utils/dates.py:28
+msgid "Sept."
+msgstr "Sept."
+
+#: utils/dates.py:28
+msgid "Oct."
+msgstr "Oct"
+
+#: utils/dates.py:28
+msgid "Nov."
+msgstr "Noi."
+
+#: utils/dates.py:28
+msgid "Dec."
+msgstr "Dec."
+
+#: models/core.py:7
+msgid "domain name"
+msgstr "nume domeniu"
+
+#: models/core.py:8
+msgid "display name"
+msgstr "nume afişat"
+
+#: models/core.py:10
+msgid "site"
+msgstr "sit"
+
+#: models/core.py:11
+msgid "sites"
+msgstr "sit"
+
+#: models/core.py:28
+msgid "label"
+msgstr "etichetă"
+
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
+msgid "name"
+msgstr "nume"
+
+#: models/core.py:31
+msgid "package"
+msgstr "pachet"
+
+#: models/core.py:32
+msgid "packages"
+msgstr "pachete"
+
+#: models/core.py:42
+msgid "python module name"
+msgstr "nume modul python"
+
+#: models/core.py:44
+msgid "content type"
+msgstr "tip conţinut"
+
+#: models/core.py:45
+msgid "content types"
+msgstr "tipuri conţinute"
+
+#: models/core.py:68
+msgid "redirect from"
+msgstr "redirectat de la "
+
+#: models/core.py:69
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Aceasta ar trebui să fie o cale absolută, excluzînd numele de domeniu. "
+"Exemplu: '/evenimente/cautare/'."
+
+#: models/core.py:70
+msgid "redirect to"
+msgstr "redirectat la"
+
+#: models/core.py:71
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Aceasta poate fi o cale absolută (ca mai sus) sau un URL începînd cu "
+"'http://'."
+
+#: models/core.py:73
+msgid "redirect"
+msgstr "redirectare"
+
+#: models/core.py:74
+msgid "redirects"
+msgstr "redictări"
+
+#: models/core.py:87
+msgid "URL"
+msgstr "URL"
+
+#: models/core.py:88
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Exemplu: '/about/contact'. Asiguraţi-vă că aveţi slash-uri la început şi la "
+"sfîrşit."
+
+#: models/core.py:89
+msgid "title"
+msgstr "titlu"
+
+#: models/core.py:90
+msgid "content"
+msgstr "conţinut"
+
+#: models/core.py:91
+msgid "enable comments"
+msgstr "permite comentarii"
+
+#: models/core.py:92
+msgid "template name"
+msgstr "nume şablon"
+
+#: models/core.py:93
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
+"Exemplu: 'flatfiles/pagina_contact'. Dacă aceasta nu există, sistemul va "
+"folosi 'flatfiles/default'."
+
+#: models/core.py:94
+msgid "registration required"
+msgstr "necesită înregistrare"
+
+#: models/core.py:94
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Dacă aceasta este bifată, numai utilizatorii logaţi vor putea vedea pagina."
+
+#: models/core.py:98
+msgid "flat page"
+msgstr "pagina plată"
+
+#: models/core.py:99
+msgid "flat pages"
+msgstr "pagini plate"
+
+#: models/core.py:117
+msgid "session key"
+msgstr "cheie sesiune"
+
+#: models/core.py:118
+msgid "session data"
+msgstr "date sesiune"
+
+#: models/core.py:119
+msgid "expire date"
+msgstr "data expirare"
+
+#: models/core.py:121
+msgid "session"
+msgstr "seiune"
+
+#: models/core.py:122
+msgid "sessions"
+msgstr "sesiuni"
+
+#: models/auth.py:8
+msgid "codename"
+msgstr "nume cod"
+
+#: models/auth.py:10
+msgid "Permission"
+msgstr "Permisiune"
+
+#: models/auth.py:11 models/auth.py:58
+msgid "Permissions"
+msgstr "Permisiuni"
+
+#: models/auth.py:22
+msgid "Group"
+msgstr "Grup"
+
+#: models/auth.py:23 models/auth.py:60
+msgid "Groups"
+msgstr "Grupuri"
+
+#: models/auth.py:33
+msgid "username"
+msgstr "nume utilizator"
+
+#: models/auth.py:34
+msgid "first name"
+msgstr "Prenume"
+
+#: models/auth.py:35
+msgid "last name"
+msgstr "Nume"
+
+#: models/auth.py:36
+msgid "e-mail address"
+msgstr "adresa email"
+
+#: models/auth.py:37
+msgid "password"
+msgstr "parola"
+
+#: models/auth.py:37
+msgid "Use an MD5 hash -- not the raw password."
+msgstr "Foloseşte un hash MD5 -- nu parola brută"
+
+#: models/auth.py:38
+msgid "staff status"
+msgstr "stare staff"
+
+#: models/auth.py:38
+msgid "Designates whether the user can log into this admin site."
+msgstr "Decide cînd utilizatorul se poate loga în acest sit de adminstrare."
+
+#: models/auth.py:39
+msgid "active"
+msgstr "activ"
+
+#: models/auth.py:40
+msgid "superuser status"
+msgstr "stare superutilizator"
+
+#: models/auth.py:41
+msgid "last login"
+msgstr "ultima logare"
+
+#: models/auth.py:42
+msgid "date joined"
+msgstr "data aderării"
+
+#: models/auth.py:44
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Suplimentar permisiunilor manual alocate, acest utilizator va primi toate "
+"permisiunile alocate fiecărui grup din care el/ea face parte."
+
+#: models/auth.py:48
+msgid "Users"
+msgstr "Utilizatori"
+
+#: models/auth.py:57
+msgid "Personal info"
+msgstr "Informaţii personale"
+
+#: models/auth.py:59
+msgid "Important dates"
+msgstr "Date importante"
+
+#: models/auth.py:182
+msgid "Message"
+msgstr "Mesaj"
+
+#: conf/global_settings.py:36
+msgid "Czech"
+msgstr "Cehă"
+
+#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
+msgid "German"
+msgstr "Germană"
+
+#: conf/global_settings.py:39
+msgid "English"
+msgstr "Engleză"
+
+#: conf/global_settings.py:40
+msgid "Spanish"
+msgstr "Spaniolă"
+
+#: conf/global_settings.py:41
+msgid "French"
+msgstr "Franceză"
+
+#: conf/global_settings.py:42
+msgid "Galician"
+msgstr "Galiciană"
+
+#: conf/global_settings.py:43
+msgid "Italian"
+msgstr "Italiană"
+
+#: conf/global_settings.py:44
+msgid "Norwegian"
+msgstr "Norvegiană"
+
+#: conf/global_settings.py:45
+msgid "Brazilian"
+msgstr "Braziliană"
+
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
+msgid "Russian"
+msgstr "Rusă"
+
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Serbian"
+msgstr "Sîrbă"
+
+#: conf/global_settings.py:50
+msgid "Simplified Chinese"
+msgstr "Chineză simplificată"
+
+#: core/validators.py:59
+msgid "This value must contain only letters, numbers and underscores."
+msgstr ""
+"Această valoare trebuie să conţină numai litere, numere şi liniuţe de "
+"subliniere."
+
+#: core/validators.py:63
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr ""
+"Această valoare trebuie să conţină numai litere, numere, liniuţe de "
+"subliniere şi slash-uri."
+
+#: core/validators.py:71
+msgid "Uppercase letters are not allowed here."
+msgstr "Literele mari nu sînt permise aici."
+
+#: core/validators.py:75
+msgid "Lowercase letters are not allowed here."
+msgstr "Literele mici nu sînt permise aici."
+
+#: core/validators.py:82
+msgid "Enter only digits separated by commas."
+msgstr "Introduceţi numai numere separate de virgule."
+
+#: core/validators.py:94
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Introduceţi adrese de email valide separate de virgule."
+
+#: core/validators.py:98
+msgid "Please enter a valid IP address."
+msgstr "Introduceţi vă rog o adresă IP validă."
+
+#: core/validators.py:102
+msgid "Empty values are not allowed here."
+msgstr "Valorile vide nu sînt permise aici."
+
+#: core/validators.py:106
+msgid "Non-numeric characters aren't allowed here."
+msgstr "Caracterele ne-numerice nu sînt permise aici."
+
+#: core/validators.py:110
+msgid "This value can't be comprised solely of digits."
+msgstr "Această valoare nu poate conţîne numai cifre."
+
+#: core/validators.py:115
+msgid "Enter a whole number."
+msgstr "Introduceţi un număr întreg."
+
+#: core/validators.py:119
+msgid "Only alphabetical characters are allowed here."
+msgstr "Numai caractere alfabetice sînt permise aici."
+
+#: core/validators.py:123
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Introduceţi o dată validă in format: AAAA-LL-ZZ."
+
+#: core/validators.py:127
+msgid "Enter a valid time in HH:MM format."
+msgstr "Introduceţi o oră în format OO:MM."
+
+#: core/validators.py:131
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "Introduceţi o dată/oră validă în format AAAA-LL-ZZ OO:MM."
+
+#: core/validators.py:135
+msgid "Enter a valid e-mail address."
+msgstr "Introduceţi o adresă de email validă."
+
+#: core/validators.py:147
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Încărcaţi o imagine validă. Fişierul încărcat nu era o imagine sau era o "
+"imagine coruptă."
+
+#: core/validators.py:154
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "URL-ul %s nu pointează către o imagine validă."
+
+#: core/validators.py:158
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+"Numerele de telefon trebuie să fie in format XXX-XXX-XXXX. \"%s\" e invalid."
+
+#: core/validators.py:166
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "URL-ul %s nu pointează către o imagine video QuickTime validă."
+
+#: core/validators.py:170
+msgid "A valid URL is required."
+msgstr "E necesar un URL valid."
+
+#: core/validators.py:184
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"E necesar cod HTML valid. Erorile specifice sînt:\n"
+"%s"
+
+#: core/validators.py:191
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "Format XML invalid: %s"
+
+#: core/validators.py:201
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "URL invalid: %s"
+
+#: core/validators.py:203
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "URL-ul %s e invalid."
+
+#: core/validators.py:209
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Introduceţi o abreviere validă în U.S."
+
+#: core/validators.py:224
+#, 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] "Îngrijiţi-vă limbajul! Cuvîntul %s nu este permis aici."
+msgstr[1] "Îngrijiţi-vă limbajul! Cuvintele %s nu sînt permise aici."
+
+#: core/validators.py:231
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr ""
+
+#: core/validators.py:250
+#, fuzzy
+msgid "Please enter something for at least one field."
+msgstr "Vă rog comletaţi ambele cîmpuri sau lăsaţi-le goale pe ambele."
+
+#: core/validators.py:259 core/validators.py:270
+msgid "Please enter both fields or leave them both empty."
+msgstr "Vă rog comletaţi ambele cîmpuri sau lăsaţi-le goale pe ambele."
+
+#: core/validators.py:277
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "Acest cîmp e necesar dacă %(field)s este %(value)s"
+
+#: core/validators.py:289
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "Acest cîmp e necesar dacă %(field)s nu este %(value)s"
+
+#: core/validators.py:308
+msgid "Duplicate values are not allowed."
+msgstr "Valorile duplicate nu sînt permise."
+
+#: core/validators.py:331
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "Această valoare trebuie să fie o putere a lui %s."
+
+#: core/validators.py:342
+msgid "Please enter a valid decimal number."
+msgstr "Vă rog introduceţi un număr zecimal valid."
+
+#: core/validators.py:344
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] "Vă rog introduceţi un număr zecimal valid cu cel mult %s cifră."
+msgstr[1] "Vă rog introduceţi un număr zecimal valid cu cel mult %s cifre."
+
+#: core/validators.py:347
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "Vă rog introduceţi un număr zecimal valid cu cel mult %s zecimală."
+msgstr[1] "Vă rog introduceţi un număr zecimal valid cu cel mult %s zecimale."
+
+#: core/validators.py:357
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "Asigură-te că fişierul încărcact are cel puţin %s octeţi."
+
+#: core/validators.py:358
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr "Asigură-te că fişierul încărcact are cel mult %s octeţi."
+
+#: core/validators.py:371
+msgid "The format for this field is wrong."
+msgstr "Formatul acestui cîmp este invalid."
+
+#: core/validators.py:386
+msgid "This field is invalid."
+msgstr "Cîmpul este invalid."
+
+#: core/validators.py:421
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "Nu pot prelua nimic de la %s."
+
+#: core/validators.py:424
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+"URL-ul %(url)s a returnat un header Content-Type invalid '%(contenttype)s'."
+
+#: core/validators.py:457
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Te rog închide tagurile %(tag)s din linia %(line)s. ( Linia începe cu \"%"
+"(start)s\".)"
+
+#: core/validators.py:461
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Textul începînd cu linia %(line)s nu e permis în acest context. (Linia "
+"începînd cu \"%(start)s\".)"
+
+#: core/validators.py:466
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"%(attr)s\" în linia %(line)s e un atribut invalid. (Linia începînd cu \"%"
+"(start)s\".)"
+
+#: core/validators.py:471
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"<%(tag)s>\" în linia %(line)s este un tag invalid. (Linia începe cu \"%"
+"(start)s\"."
+
+#: core/validators.py:475
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Unui tag din linia %(line)s îi lipseşte unul sau mai multe atribute. (Linia "
+"începe cu \"%(start)s\".)"
+
+#: core/validators.py:480
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Atributul \"%(attr)s\" din linia %(line)s are o valoare invalidă. ( Linia "
+"începe cu \"%(start)s\".)"
+
+#: core/meta/fields.py:95
+msgid " Separate multiple IDs with commas."
+msgstr "Separă ID-urile multiple cu virgulă."
+
+#: core/meta/fields.py:98
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+" Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru a selecta mai "
+"multe."

django/conf/locale/ru/LC_MESSAGES/django.po

@@ -234,8 +234,8 @@ msgstr "
 msgid "Django administration"
 msgstr "áÄÍÉÎÉÓÔÒÉÒÏ×ÁÎÉÅ Django"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -365,18 +365,26 @@ msgstr ""
 "ÎÏ, ÐÒÅÄÏÓÔÁ×ÌÅÎÎÙÈ ×ÁÍ ÐÒÁ× ÎÅÄÏÓÔÁÔÏÞÎÏ ÄÌÑ ÕÄÁÌÅÎÉÑ ÓÌÅÄÕÀÝÉÈÔÉÐÏ× "
 "ÏÂßÅËÔÏ×:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
+msgstr "ïÛÉÂËÁ ÓÅÒ×ÅÒÁ (500)"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ  %(object_name)s \"%(object)s\"? ÷ÓÅ "
-"ÓÌÅÄÕÀÝÉÅÏÂßÅËÔÙ ÔÁËÖÅ ÂÕÄÕÔ ÕÄÁÌÅÎÙ:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
-msgstr "äÁ, Ñ Õ×ÅÒÅÎ"
+msgstr "ïÛÉÂËÁ ÓÅÒ×ÅÒÁ <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 ""
+"ðÒÏÉÚÏÛÌÁ ÏÛÉÂËÁ. ïÔÞÅÔ Ï ÏÛÉÂËÅ ÏÔÐÒÁ×ÌÅÎ ÁÄÍÉÎÉÓÔÒÁÔÏÒÁÍ ÓÁÊÔÁ ÐÏ e-mailÉ "
+"ÏÎÁ ÄÏÌÖÎÁ ÂÙÔØ ×ÓËÏÒÅ ÉÓÐÒÁ×ÌÅÎÁ. âÌÁÇÏÄÁÒÉÍ ×ÁÓ ÎÁ ÔÅÒÐÅÎÉÅ É ÐÏÍÏÝØ."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "óÔÒÁÎÉÃÁ ÎÅ ÎÁÊÄÅÎÁ"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -416,6 +424,34 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "÷ÙÈÏÄ"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, 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 ""
+"õÄÁÌÅÎÉÅ ÏÂØÅËÔÁ %(object_name)s '%(object)s' ÐÒÉ×ÅÄÅÔ Ë ÕÄÁÌÅÎÉÀ ÚÁ×ÉÓÉÍÙÈ "
+"ÎÏ, ÐÒÅÄÏÓÔÁ×ÌÅÎÎÙÈ ×ÁÍ ÐÒÁ× ÎÅÄÏÓÔÁÔÏÞÎÏ ÄÌÑ ÕÄÁÌÅÎÉÑ ÓÌÅÄÕÀÝÉÈÔÉÐÏ× "
+"ÏÂßÅËÔÏ×:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ  %(object_name)s \"%(object)s\"? ÷ÓÅ "
+"ÓÌÅÄÕÀÝÉÅÏÂßÅËÔÙ ÔÁËÖÅ ÂÕÄÕÔ ÕÄÁÌÅÎÙ:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "äÁ, Ñ Õ×ÅÒÅÎ"
+
 #: 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
@@ -902,53 +938,61 @@ msgid "Czech"
 msgstr ""
 
 #: conf/global_settings.py:38
-msgid "German"
+msgid "Welsh"
 msgstr ""
 
 #: conf/global_settings.py:39
-msgid "English"
+msgid "German"
 msgstr ""
 
 #: conf/global_settings.py:40
-msgid "Spanish"
+msgid "English"
 msgstr ""
 
 #: conf/global_settings.py:41
-msgid "French"
+msgid "Spanish"
 msgstr ""
 
 #: conf/global_settings.py:42
-msgid "Galician"
+msgid "French"
 msgstr ""
 
 #: conf/global_settings.py:43
-msgid "Italian"
+msgid "Galician"
 msgstr ""
 
 #: conf/global_settings.py:44
-msgid "Norwegian"
+msgid "Italian"
 msgstr ""
 
 #: conf/global_settings.py:45
-msgid "Brazilian"
+msgid "Norwegian"
 msgstr ""
 
 #: conf/global_settings.py:46
-msgid "Russian"
+msgid "Brazilian"
 msgstr ""
 
 #: conf/global_settings.py:47
-msgid "Serbian"
+msgid "Romanian"
 msgstr ""
 
 #: conf/global_settings.py:48
-msgid "Simplified Chinese"
+msgid "Russian"
 msgstr ""
 
 #: conf/global_settings.py:49
 msgid "Slovak"
 msgstr ""
 
+#: conf/global_settings.py:49
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:50
+msgid "Simplified Chinese"
+msgstr ""
+
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "úÎÁÞÅÎÉÅ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÔÏÌØËÏ ÂÕË×Ù, ÃÉÆÒÙ É ÐÏÄÞÅÒËÉ×ÁÎÉÑ."

django/conf/locale/sk/LC_MESSAGES/django.po

@@ -237,8 +237,8 @@ msgstr "Django web admin"
 msgid "Django administration"
 msgstr "Administrácia Django"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -367,18 +367,26 @@ msgstr ""
 "súvisiacich objektov, ale váš účet nemá povolenie na mazanie nasledujúcich "
 "typov objektov:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
+msgstr "Chyba servera (500)"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"Ste si istý, že chcete vymazať %(object_name)s \"%(object)s\"? Všetky "
-"nasledujúce objekty budú tiež vymazané :"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
-msgstr "Ano, som si istý"
+msgstr "Chyba servera <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 ""
+"Vznikla chyba. Prostredníctvom e-mailu  bol o nej informovaný správca a "
+"chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Stránka sa nenašla"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -419,6 +427,34 @@ msgstr ""
 msgid "Save"
 msgstr "aktívny"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odhlásenie"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, 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 ""
+"Vymazaním objektu %(object_name)s '%(object)s' môžete spôsobiť vymazanie "
+"súvisiacich objektov, ale váš účet nemá povolenie na mazanie nasledujúcich "
+"typov objektov:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"Ste si istý, že chcete vymazať %(object_name)s \"%(object)s\"? Všetky "
+"nasledujúce objekty budú tiež vymazané :"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Ano, som si istý"
+
 #: 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
@@ -909,6 +945,10 @@ msgstr "Zpráva"
 msgid "Czech"
 msgstr "Český"
 
+#: conf/global_settings.py:38
+msgid "Welsh"
+msgstr ""
+
 #: conf/global_settings.py:38
 msgid "German"
 msgstr "Nemecký"

django/conf/locale/sr/LC_MESSAGES/django.po

@@ -240,8 +240,8 @@ msgstr "Django administracija sajta"
 msgid "Django administration"
 msgstr "Django administracija"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -370,18 +370,26 @@ msgstr ""
 "Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja dodatnih "
 "podataka, ali nemate prava da brišete sledeće tipove podataka:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
+msgstr "Greška na serveru (500)"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće "
-"obrisani i sledeći pridruženi objekti:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
-msgstr "Da, siguran sam"
+msgstr "Greška na serveru <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 ""
+"Dogodila se greška koja je prijavljena administratorima i biće popravljena "
+"uskoro. Hvala Vam na strpljenju."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Strana nije pronađena"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -423,6 +431,33 @@ msgstr ""
 msgid "Save"
 msgstr "aktivan"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odjavi se"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, 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 ""
+"Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja dodatnih "
+"podataka, ali nemate prava da brišete sledeće tipove podataka:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće "
+"obrisani i sledeći pridruženi objekti:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Da, siguran sam"
+
 #: 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
@@ -913,6 +948,10 @@ msgstr "Poruka"
 msgid "Czech"
 msgstr "Češki"
 
+#: conf/global_settings.py:38
+msgid "Welsh"
+msgstr ""
+
 #: conf/global_settings.py:38
 msgid "German"
 msgstr "Nemački"

django/conf/locale/zh_CN/LC_MESSAGES/django.po

@@ -239,8 +239,8 @@ msgstr "Django管理站点"
 msgid "Django administration"
 msgstr "Django管理员"
 
-#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -367,17 +367,26 @@ msgstr ""
 "删除 %(object_name)s  '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下"
 "列类型的对象："
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/500.html:6
-#, python-format
+msgid "Server error (500)"
-msgid ""
+msgstr "服务器错误(500)"
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"你确信相要删除 %(object_name)s \"%(object)s\"？所有相关的项目都将被删除："
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/500.html:9
-msgid "Yes, I'm sure"
+msgid "Server Error <em>(500)</em>"
-msgstr "是的，我确定"
+msgstr "服务器错误 <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 ""
+"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢"
+"谢你的关心。"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "页面没有找到"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -418,6 +427,32 @@ msgstr ""
 msgid "Save"
 msgstr "活动"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "注销"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, 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 ""
+"删除 %(object_name)s  '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下"
+"列类型的对象："
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, 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 ""
+"你确信相要删除 %(object_name)s \"%(object)s\"？所有相关的项目都将被删除："
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "是的，我确定"
+
 #: 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
@@ -898,6 +933,10 @@ msgstr "消息"
 msgid "Czech"
 msgstr "捷克语"
 
+#: conf/global_settings.py:38
+msgid "Welsh"
+msgstr ""
+
 #: conf/global_settings.py:38
 msgid "German"
 msgstr "德语"

django/conf/urls/rss.py

@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('django.views',
-    (r'^(?P<slug>\w+)/$', 'rss.rss.feed'),
+    (r'^(?P<slug>[^/]+)/$', 'rss.rss.feed'),
-    (r'^(?P<slug>\w+)/(?P<param>[\w/]+)/$', 'rss.rss.feed'),
+    (r'^(?P<slug>[^/]+)/(?P<param>.+)/$', 'rss.rss.feed'),
 )

django/core/rss.py

@@ -1,9 +1,90 @@
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
-from django.core.template import Context, loader
+from django.core.template import Context, loader, Template, TemplateDoesNotExist
 from django.models.core import sites
 from django.utils import feedgenerator
 from django.conf.settings import LANGUAGE_CODE, SETTINGS_MODULE
 
+def add_domain(domain, url):
+    if not url.startswith('http://'):
+        url = u'http://%s%s' % (domain, url)
+    return url
+
+class FeedDoesNotExist(ObjectDoesNotExist):
+    pass
+
+class Feed:
+    item_pubdate = None
+    enclosure_url = None
+
+    def item_link(self, item):
+        try:
+            return item.get_absolute_url()
+        except AttributeError:
+            raise ImproperlyConfigured, "Give your %s class a get_absolute_url() method, or define an item_link() method in your RSS class." % item.__class__.__name__
+
+    def __get_dynamic_attr(self, attname, obj):
+        attr = getattr(self, attname)
+        if callable(attr):
+            try:
+                return attr(obj)
+            except TypeError:
+                return attr()
+        return attr
+
+    def get_feed(self, url=None):
+        """
+        Returns a feedgenerator.DefaultRssFeed object, fully populated, for
+        this feed. Raises FeedDoesNotExist for invalid parameters.
+        """
+        if url:
+            try:
+                obj = self.get_object(url.split('/'))
+            except (AttributeError, ObjectDoesNotExist):
+                raise FeedDoesNotExist
+        else:
+            obj = None
+
+        current_site = sites.get_current()
+        link = self.__get_dynamic_attr('link', obj)
+        link = add_domain(current_site.domain, link)
+
+        feed = feedgenerator.DefaultRssFeed(
+            title = self.__get_dynamic_attr('title', obj),
+            link = link,
+            description = self.__get_dynamic_attr('description', obj),
+            language = LANGUAGE_CODE.decode()
+        )
+
+        try:
+            title_template = loader.get_template('rss/%s_title' % self.slug)
+        except TemplateDoesNotExist:
+            title_template = Template('{{ obj }}')
+        try:
+            description_template = loader.get_template('rss/%s_description' % self.slug)
+        except TemplateDoesNotExist:
+            description_template = Template('{{ obj }}')
+
+        for item in self.__get_dynamic_attr('items', obj):
+            link = add_domain(current_site.domain, self.__get_dynamic_attr('item_link', item))
+            enc = None
+            enc_url = self.__get_dynamic_attr('enclosure_url', item)
+            if enc_url:
+                enc = feedgenerator.Enclosure(
+                    url = enc_url.decode('utf-8'),
+                    length = str(self.__get_dynamic_attr('enclosure_length', item)).decode('utf-8'),
+                    mime_type = self.__get_dynamic_attr('enclosure_mime_type', item).decode('utf-8'),
+                )
+            feed.add_item(
+                title = title_template.render(Context({'obj': item, 'site': current_site})).decode('utf-8'),
+                link = link,
+                description = description_template.render(Context({'obj': item, 'site': current_site})).decode('utf-8'),
+                unique_id = link,
+                enclosure = enc,
+                pubdate = self.__get_dynamic_attr('item_pubdate', item),
+            )
+        return feed
+
+# DEPRECATED
 class FeedConfiguration:
     def __init__(self, slug, title_cb, link_cb, description_cb, get_list_func_cb, get_list_kwargs,
         param_func=None, param_kwargs_cb=None, get_list_kwargs_cb=None, get_pubdate_cb=None,
@@ -118,15 +199,18 @@ class FeedConfiguration:
 # global dict used by register_feed and get_registered_feed
 _registered_feeds = {}
 
+# DEPRECATED
 class FeedIsNotRegistered(Exception):
     pass
 
-class FeedRequiresParam(Exception):
+# DEPRECATED
-    pass
-
 def register_feed(feed):
     _registered_feeds[feed.slug] = feed
 
+def register_feeds(*feeds):
+    for f in feeds:
+        _registered_feeds[f.slug] = f
+
 def get_registered_feed(slug):
     # try to load a RSS settings module so that feeds can be registered
     try:
@@ -137,4 +221,3 @@ def get_registered_feed(slug):
         return _registered_feeds[slug]
     except KeyError:
         raise FeedIsNotRegistered
-

django/views/rss/rss.py

@@ -5,7 +5,7 @@ from django.utils.httpwrappers import HttpResponse
 def feed(request, slug, param=None):
     try:
         f = rss.get_registered_feed(slug).get_feed(param)
-    except rss.FeedIsNotRegistered:
+    except (rss.FeedIsNotRegistered, rss.FeedDoesNotExist):
         raise Http404
     response = HttpResponse(mimetype='application/xml')
     f.write(response, 'utf-8')

docs/authentication.txt

@@ -147,8 +147,9 @@ The most basic way to create users is to use the standard Django
     ...     is_active=True, is_superuser=False)
     >>> u.save()
 
-Note that ``password_md5`` requires the raw MD5 hash. Because that's a pain,
+Note that ``password_md5`` requires the raw MD5 hash (as created by
-there's a ``create_user`` helper function::
+``md5.new().hexdigest()``). Because that's a pain, there's a ``create_user``
+helper function::
 
     >>> from django.models.auth import users
     >>> u = users.create_user('john', 'lennon@thebeatles.com', 'johnpassword')
@@ -196,7 +197,12 @@ previous section). You can tell them apart with ``is_anonymous()``, like so::
     else:
         # Do something for logged-in users.
 
+If you want to use ``request.user`` in your view code, make sure you have
+``SessionMiddleware`` enabled. See the `session documentation`_ for more
+information.
+
 .. _request objects: http://www.djangoproject.com/documentation/request_response/#httprequest-objects
+.. _session documentation: http://www.djangoproject.com/documentation/sessions/
 
 Limiting access to logged-in users
 ----------------------------------
@@ -251,8 +257,8 @@ Here's the same thing, using Python 2.4's decorator syntax::
 Limiting access to logged-in users that pass a test
 ---------------------------------------------------
 
-To limit access based on certain permissions or another test, you'd do the same
+To limit access based on certain permissions or some other test, you'd do
-thing as described in the previous section.
+essentially the same thing as described in the previous section.
 
 The simple way is to run your test on ``request.user`` in the view directly.
 For example, this view checks to make sure the user is logged in and has the
@@ -276,13 +282,195 @@ As a shortcut, you can use the convenient ``user_passes_test`` decorator::
 Note that ``user_passes_test`` does not automatically check that the ``User``
 is not anonymous.
 
-
-
 Permissions
 ===========
 
+Django comes with a simple permissions system. It provides a way to assign
+permissions to specific users and groups of users.
+
+It's used by the Django admin site, but you're welcome to use it in your own
+code.
+
+The Django admin site uses permissions as follows:
+
+    * Access to view the "add" form and add an object is limited to users with
+      the "add" permission for that type of object.
+    * Access to view the change list, view the "change" form and change an
+      object is limited to users with the "change" permission for that type of
+      object.
+    * Access to delete an object is limited to users with the "delete"
+      permission for that type of object.
+
+Permissions are set globally per type of object, not per specific object
+instance. For example, it's possible to say "Mary may change news stories," but
+it's not currently possible to say "Mary may change news stories, but only the
+ones she created herself" or "Mary may only change news stories that have a
+certain status or publication date." The latter functionality is something
+Django developers are currently discussing.
+
+Default permissions
+-------------------
+
+Three basic permissions -- add, create and delete -- are automatically created
+for each Django model that has ``admin`` set. Behind the scenes, these
+permissions are added to the ``auth_permissions`` database table when you run
+``django-admin.py install [app]``. You can view the exact SQL ``INSERT``
+statements by running ``django-admin.py sqlinitialdata [app]``.
+
+Note that if your model doesn't have ``admin`` set when you run
+``django-admin.py install``, the permissions won't be created. If you
+initialize your database and add ``admin`` to models after the fact, you'll
+need to add the permissions to the database manually. Do this by running
+``django-admin.py installperms [app]``, which creates any missing permissions
+for the given app.
+
+Custom permissions
+------------------
+
+To create custom permissions for a given model object, use the ``permissions``
+`model META attribute`_.
+
+This example model creates three custom permissions::
+
+    class USCitizen(meta.Model):
+        # ...
+        class META:
+            permissions = (
+                ("can_drive", "Can drive"),
+                ("can_vote", "Can vote in elections"),
+                ("can_drink", "Can drink alcohol"),
+            )
+
+.. _model META attribute: http://www.djangoproject.com/documentation/model_api/#meta-options
+
+API reference
+-------------
+
+Just like users, permissions are implemented in a Django model that lives in
+`django/models/auth.py`_.
+
+Fields
+~~~~~~
+
+``Permission`` objects have the following fields:
+
+    * ``name`` -- Required. 50 characters or fewer. Example: ``'Can vote'``.
+    * ``package`` -- Required. A reference to the ``packages`` database table,
+      which contains a record for each installed Django application.
+    * ``codename`` -- Required. 100 characters or fewer. Example: ``'can_vote'``.
+
+Methods
+~~~~~~~
+
+``Permission`` objects have the standard data-access methods like any other
+`Django model`_:
+
+Authentication data in templates
+================================
+
+The currently logged-in user and his/her permissions are made available in the
+`template context`_ when you use ``DjangoContext``.
+
+Users
+-----
+
+The currently logged-in user, either a ``User`` object or an``AnonymousUser``
+instance, is stored in the template variable ``{{ user }}``::
+
+    {% if user.is_anonymous %}
+        <p>Welcome, new user. Please log in.</p>
+    {% else %}
+        <p>Welcome, {{ user.username }}. Thanks for logging in.</p>
+    {% endif %}
+
+Permissions
+-----------
+
+The currently logged-in user's permissions are stored in the template variable
+``{{ perms }}``. This is an instance of ``django.core.extensions.PermWrapper``,
+which is a template-friendly proxy of permissions.
+
+In the ``{{ perms }}`` object, single-attribute lookup is a proxy to
+``User.has_module_perms``. This example would display ``True`` if the logged-in
+user had any permissions in the ``foo`` app::
+
+    {{ perms.foo }}
+
+Two-level-attribute lookup is a proxy to ``User.has_perm``. This example would
+display ``True`` if the logged-in user had the permission ``foo.can_vote``::
+
+    {{ perms.foo.can_vote }}
+
+Thus, you can check permissions in template ``{% if %}`` statements::
+
+    {% if perms.foo %}
+        <p>You have permission to do something in the foo app.</p>
+        {% if perms.foo.can_vote %}
+            <p>You can vote!</p>
+        {% endif %}
+        {% if perms.foo.can_drive %}
+            <p>You can drive!</p>
+        {% endif %}
+    {% else %}
+        <p>You don't have permission to do anything in the foo app.</p>
+    {% endif %}
+
+.. _template context: http://www.djangoproject.com/documentation/models/templates_python/
+
 Groups
 ======
 
+Groups are a generic way of categorizing users to apply permissions, or some
+other label, to those users. A user can belong to any number of groups.
+
+A user in a group automatically has the permissions granted to that group. For
+example, if the group ``Site editors`` has the permission
+``can_edit_home_page``, any user in that group will have that permission.
+
+Beyond permissions, groups are a convenient way to categorize users to apply
+some label, or extended functionality, to them. For example, you could create
+a group ``'Special users'``, and you could write code that would do special
+things to those users -- such as giving them access to a members-only portion
+of your site, or sending them members-only e-mail messages.
+
 Messages
 ========
+
+The message system is a lightweight way to queue messages for given users.
+
+A message is associated with a User. There's no concept of expiration or
+timestamps.
+
+Messages are used by the Django admin after successful actions. For example,
+``"The poll Foo was created successfully."`` is a message.
+
+The API is simple::
+
+    * To add messages, use ``user.add_message(message_text)``.
+    * To retrieve/delete messages, use ``user.get_and_delete_messages()``,
+      which returns a list of ``Message`` objects in the user's queue (if any)
+      and deletes the messages from the queue.
+
+In this example view, the system saves a message for the user after creating
+a playlist::
+
+    def create_playlist(request, songs):
+        # Create the playlist with the given songs.
+        # ...
+        request.user.add_message("Your playlist was added successfully.")
+        return render_to_response("playlists/create", context_instance=DjangoContext)
+
+When you use ``DjangoContext``, the currently logged-in user and his/her
+messages are made available in the `template context`_ as the template variable
+``{{ messages }}``. Here's an example of template code that displays messages::
+
+    {% if messages %}
+    <ul>
+        {% for message in messages %}
+        <li>{{ message.message }}</li>
+        {% endfor %}
+    </ul>
+    {% endif %}
+
+Note that ``DjangoContext`` calls ``get_and_delete_messages`` behind the
+scenes, so any messages will be deleted even if you don't display them.