diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index 340a4198dc..a5c3a73407 100644
Binary files a/django/conf/locale/bn/LC_MESSAGES/django.mo and b/django/conf/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po
index c710e23028..19effac18a 100644
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/django/conf/locale/bn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-13 13:41-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: 2005-11-12 20:05+0530\n"
 "Last-Translator: Baishampayan Ghose <b.ghose@gnu.org.in>\n"
 "Language-Team: Ankur Bangla <core@bengalinux.org>\n"
@@ -16,6 +16,73 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "মন্তব্য সক্রিয় করুন"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "অভ্যন্তরস্থ বস্তু"
+
+#: contrib/comments/views/comments.py:112
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
+msgstr ""
+
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
+msgstr ""
+
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr ""
+
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "কাজের সময়"
@@ -44,8 +111,264 @@ msgstr "কার্যবিবরণী এন্ট্রি"
 msgid "log entries"
 msgstr "কার্যবিবরণী এন্ট্রি সমুহ"
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "প্রবেশ করুন"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "যোগ করুন"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "পরিবর্তন"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "পরিবর্তন"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "পাসওয়ার্ড পরিবর্তন করুন"
+
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "কাজের সময়"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "তারিখ/সময়"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "ই-মেল ঠিকানা:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "ডিসেম্বর"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "ই-মেল ঠিকানা"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "একটি গোটা সংখ্যা ঢোকান।"
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "ইউ.আর.এল"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "যোগ করুন"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "পরিবর্তন"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "আপনার কোন কিছু সম্পাদনা করতে অনুমতি নেই।"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "সাম্প্রতিক কাজ"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "আমার কাজ"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "কিছুই পাওয়া যাচ্ছে না"
+
 #: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -55,7 +378,28 @@ msgstr "কার্যবিবরণী এন্ট্রি সমুহ"
 msgid "Home"
 msgstr "বাড়ি"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "সার্ভার ত্রুটি"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "সার্ভার ত্রুটি (৫০০)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "সার্ভার ত্রুটি<em>(৫০০)</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/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "ইতিহাস"
 
@@ -91,59 +435,6 @@ msgstr "জ্যাঙ্গো স্থান অ্যাডমিন"
 msgid "Django administration"
 msgstr "জ্যাঙ্গো পরিচালনা"
 
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "সার্ভার ত্রুটি"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "সার্ভার ত্রুটি (৫০০)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "সার্ভার ত্রুটি<em>(৫০০)</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/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "আমরা দুঃখিত, কিন্তু আবেদনকৃত পাতা খুঁজে পাওয়া গেল না।"
-
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "যোগ করুন"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "পরিবর্তন"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "আপনার কোন কিছু সম্পাদনা করতে অনুমতি নেই।"
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "সাম্প্রতিক কাজ"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "আমার কাজ"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "কিছুই পাওয়া যাচ্ছে না"
-
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "ব্যবহারকারীর নাম:"
@@ -156,21 +447,32 @@ msgstr "পাসওয়ার্ড:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "আপনি কি <a href=\"/password_reset/\">আপনার পাসওয়ার্ড ভুলে গেছেন</a>?"
 
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "প্রবেশ করুন"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "পাতা খুঁজে পাওয়া গেল না"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "স্বাগত,"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "আমরা দুঃখিত, কিন্তু আবেদনকৃত পাতা খুঁজে পাওয়া গেল না।"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "পাসওয়ার্ড পরিবর্তন করুন"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "বাইরে যান"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -195,6 +497,44 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "হ্যাঁ, আমি নিশ্চিত"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "স্বাগত,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "পাসওয়ার্ড পরিবর্তন করুন"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "বাইরে যান"
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "সক্রিয়"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+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
@@ -340,10 +680,6 @@ msgstr "রিডাইরেক্ট"
 msgid "redirects"
 msgstr "রিডাইরেক্ট করে"
 
-#: contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr "ইউ.আর.এল"
-
 #: contrib/flatpages/models/flatpages.py:7
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -658,79 +994,79 @@ msgstr "ব্যক্তিগত তথ্য"
 msgid "Important dates"
 msgstr "গুরুত্বপূর্ণ তারিখ"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "বার্তা"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Bengali"
 msgstr "বাংলা"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "চেক"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr "ওয়েল্শ"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "জার্মান"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "ইংরেজী"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "স্প্যানিশ"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "ফরাসী"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "গ্যালিসিয়"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "ইতালিয়"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "নরওয়েজিয়"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "ব্রাজিলীয়"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr "রোমানীয়"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "রুশ"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Slovak"
 msgstr "স্লোভাক"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "সার্বিয়ান"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "সরলীকৃত চীনা"
 
@@ -995,11 +1331,11 @@ msgstr ""
 "\"%(attr)s\"বৈশিষ্ট্যয় লাইন %(line)s একটি অবৈধ মান আছে । (\"%(start)s\"এর সঙ্গে "
 "লাইন আরম্ভ।)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "একাধিক আই.ডি.কমার দ্বারা আলাদা করুন।"
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index da3da2c6b5..096794def1 100644
Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index 14b40f98a0..47a1d57ff6 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -7,122 +7,116 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Czech translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: 2005-10-31 19:42+0100\n"
 "Last-Translator: Radek Svarz <translate@svarz.cz>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "povolit komentáře"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
-msgstr ""
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "obsah"
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, python-format
-msgid "Select %s to change"
-msgstr ""
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "Přidat"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "Změnit"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "Změnit"
-
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "Změnit heslo"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "čas akce"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "object id"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "object repr"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "příznak akce"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "zpráva změny"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "log záznam"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "log záznamy"
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -150,6 +144,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Přidat"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Změnit"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Změnit"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Změnit heslo"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -219,7 +321,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -231,48 +333,16 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django správa webu"
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Django správa"
-
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: 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/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 "Domů"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Chyba serveru"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Chyba serveru (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-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/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena."
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
 
 #: contrib/admin/templates/admin/index.html:27
 #: contrib/admin/templates/admin/change_form.html:14
@@ -299,6 +369,38 @@ msgstr "Mé akce"
 msgid "None available"
 msgstr "Nic"
 
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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 "Domů"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Chyba serveru"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Chyba serveru (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+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/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -328,6 +430,14 @@ msgstr ""
 "Tento objekt nemá historii změn. Pravděpodobně nebyl přidán přes "
 "administrátorské rozhraní."
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django správa webu"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django správa"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Uživatelské jméno:"
@@ -340,22 +450,14 @@ msgstr "Heslo:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">Zapomněl(a) jste své heslo?</a>"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Vítejte,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Změnit heslo"
-
-#: 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/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -375,6 +477,41 @@ msgstr ""
 msgid "Order:"
 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 ""
+"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/admin/base.html:23
+msgid "Welcome,"
+msgstr "Vítejte,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Změnit heslo"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odhlásit se"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -396,14 +533,10 @@ msgstr ""
 msgid "Save"
 msgstr "aktivní"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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"
+msgid " By %(title)s "
+msgstr ""
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -428,8 +561,12 @@ msgid "Password reset"
 msgstr "Obnovení hesla"
 
 #: 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 "Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vaše heslo obnovíme a zašleme Vám e-mailem nové."
+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 ""
+"Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vaše heslo "
+"obnovíme a zašleme Vám e-mailem nové."
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -453,12 +590,20 @@ msgid "Password reset successful"
 msgstr "Obnovení hesla bylo úspěšné"
 
 #: 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 "Poslali jsme Vám e-mailem nové heslo na adresu, kterou jste zadal(a). Měl(a) byste ji dostat během okamžiku."
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Poslali jsme Vám e-mailem nové heslo na adresu, kterou jste zadal(a). Měl(a) "
+"byste ji dostat během okamžiku."
 
 #: 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 "Prosíme, pro zabezpečení vložte svoje staré heslo a poté vložte dvakrát nové heslo, takže můžeme ověřit, že jste ho napsal(a) správně."
+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 ""
+"Prosíme, pro zabezpečení vložte svoje staré heslo a poté vložte dvakrát nové "
+"heslo, takže můžeme ověřit, že jste ho napsal(a) správně."
 
 #: contrib/admin/templates/registration/password_change_form.html:17
 msgid "Old password:"
@@ -507,37 +652,85 @@ msgstr "Děkujeme za používání našeho webu!"
 msgid "The %(site_name)s team"
 msgstr "Tým %(site_name)s"
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "čas akce"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "přesměrovat z"
 
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "object id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "object repr"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "příznak akce"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "zpráva změny"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "log záznam"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "log záznamy"
-
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
+"Toto by měla být absolutní cesta, bez domény. Např.  '/udalosti/hledat/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "přesměrovat na"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na "
+"'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "přesměrovat"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "přesměrování"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Příklad: '/o/kontakt/'. Ujistěte se, že máte počáteční a konečná lomítka."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "titulek"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "obsah"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "povolit komentáře"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "jméno šablony"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém "
+"použije 'flatfiles/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "nutná registrace"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Pokud je zaškrtnuto, pouze přihlášení uživatelé budou moci prohlížet tuto "
+"stránku."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "statická stránka"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "statické stránky"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
@@ -587,28 +780,23 @@ msgstr "Leden"
 msgid "February"
 msgstr "Únor"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "March"
 msgstr "Březen"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "April"
 msgstr "Duben"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "May"
 msgstr "Květen"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "June"
 msgstr "Červen"
 
-#: utils/dates.py:15
-#: utils/dates.py:27
+#: utils/dates.py:15 utils/dates.py:27
 msgid "July"
 msgstr "Červenec"
 
@@ -680,10 +868,7 @@ msgstr "weby"
 msgid "label"
 msgstr "nadpis"
 
-#: models/core.py:29
-#: models/core.py:40
-#: models/auth.py:6
-#: models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
 msgid "name"
 msgstr "jméno"
 
@@ -707,86 +892,7 @@ msgstr "typ obsahu"
 msgid "content types"
 msgstr "typy obsahu"
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr "přesměrovat z"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Toto by měla být absolutní cesta, bez domény. Např.  '/udalosti/hledat/'."
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "přesměrovat na"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na "
-"'http://'."
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "přesměrovat"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "přesměrování"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Příklad: '/o/kontakt/'. Ujistěte se, že máte počáteční a konečná lomítka."
-
-#: models/core.py:89
-msgid "title"
-msgstr "titulek"
-
-#: models/core.py:90
-msgid "content"
-msgstr "obsah"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "povolit komentáře"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "jméno šablony"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém "
-"použije 'flatfiles/default'."
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "nutná registrace"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Pokud je zaškrtnuto, pouze přihlášení uživatelé budou moci prohlížet tuto "
-"stránku."
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "statická stránka"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "statické stránky"
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr "klíč sezení"
 
@@ -814,8 +920,7 @@ msgstr "codename"
 msgid "Permission"
 msgstr "Oprávnění"
 
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
 msgid "Permissions"
 msgstr "Oprávnění"
 
@@ -823,8 +928,7 @@ msgstr "Oprávnění"
 msgid "Group"
 msgstr "Skupina"
 
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -878,8 +982,12 @@ msgid "date joined"
 msgstr "datum zaregistrování"
 
 #: 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 "Kromě manuálně přidělených oprávnění uživatel dostane všechna oprávnění pro každou skupinu, ve které je."
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Kromě manuálně přidělených oprávnění uživatel dostane všechna oprávnění pro "
+"každou skupinu, ve které je."
 
 #: models/auth.py:48
 msgid "Users"
@@ -893,7 +1001,7 @@ msgstr "Osobní informace"
 msgid "Important dates"
 msgstr "Důležitá data"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Zpráva"
 
@@ -901,73 +1009,82 @@ msgstr "Zpráva"
 msgid "Bengali"
 msgstr "Bengálsky"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Česky"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr "Welšsky"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Německy"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Anglicky"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Španělsky"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Francouzsky"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galicijsky"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr "Islandština"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Italsky"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Norsky"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brazilsky"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Rusky"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Srbsky"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Jednoduchá čínština"
 
-#: conf/global_settings.py:49
-msgid "Slovak"
-msgstr ""
-
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Tato hodnota musí obsahovat pouze znaky, čísla nebo podtržítka."
 
 #: core/validators.py:63
 msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka nebo lomítka."
+msgstr ""
+"Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka nebo lomítka."
 
 #: core/validators.py:71
 msgid "Uppercase letters are not allowed here."
@@ -1026,8 +1143,12 @@ msgid "Enter a valid e-mail address."
 msgstr "Vložte platnou e-mailovou adresu."
 
 #: core/validators.py:147
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Nahrajte na server platný obrázek. Soubor, který jste nahrál(a) nebyl obrázek, nebo byl porušen."
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Nahrajte na server platný obrázek. Soubor, který jste nahrál(a) nebyl "
+"obrázek, nebo byl porušen."
 
 #: core/validators.py:154
 #, python-format
@@ -1067,8 +1188,7 @@ msgstr "Špatně formované XML: %s"
 msgid "Invalid URL: %s"
 msgstr "Neplatné URL: %s"
 
-#: core/validators.py:205
-#: core/validators.py:207
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "Odkaz na URL %s je rozbitý."
@@ -1094,8 +1214,7 @@ msgstr "Toto pole se musí shodovat s polem '%s'."
 msgid "Please enter something for at least one field."
 msgstr "Prosíme, vložte něco alespoň pro jedno pole."
 
-#: core/validators.py:263
-#: core/validators.py:274
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Prosíme, vložte obě pole, nebo je nechte obě prázdná."
 
@@ -1125,7 +1244,8 @@ msgstr "Prosíme, vložte platné číslo."
 #: core/validators.py:348
 #, 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."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
 msgstr[0] "Prosíme, vložte platné číslo s nejvíce %s cifrou celkem."
 msgstr[1] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."
 msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."
@@ -1133,10 +1253,16 @@ msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."
 #: core/validators.py:351
 #, 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] "Prosíme, vložte platné číslo s nejvíce %s cifrou za desetinnou čárkou celkem."
-msgstr[1] "Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou celkem."
-msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou celkem."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+"Prosíme, vložte platné číslo s nejvíce %s cifrou za desetinnou čárkou celkem."
+msgstr[1] ""
+"Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou "
+"celkem."
+msgstr[2] ""
+"Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou "
+"celkem."
 
 #: core/validators.py:361
 #, python-format
@@ -1163,44 +1289,71 @@ msgstr "Nemohl jsem získat nic z %s."
 
 #: core/validators.py:428
 #, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr "URL %(url)s vrátilo neplatnou hlavičku Content-Type '%(contenttype)s'."
 
 #: core/validators.py:461
 #, python-format
-msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
-msgstr "Prosíme, zavřete nezavřenou značku %(tag)s z řádky %(line)s. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Prosíme, zavřete nezavřenou značku %(tag)s z řádky %(line)s. (Řádka začíná s "
+"\"%(start)s\".)"
 
 #: core/validators.py:465
 #, python-format
-msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
-msgstr "Nějaký text začínající na řádce %(line)s není povolen v tomto kontextu. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Nějaký text začínající na řádce %(line)s není povolen v tomto kontextu. "
+"(Řádka začíná s \"%(start)s\".)"
 
 #: core/validators.py:470
 #, python-format
-msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
-msgstr "\"%(attr)s\" na řádce %(line)s je neplatný atribut. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"%(attr)s\" na řádce %(line)s je neplatný atribut. (Řádka začíná s \"%"
+"(start)s\".)"
 
 #: core/validators.py:475
 #, python-format
-msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
-msgstr "\"<%(tag)s>\" na řádce %(line)s je neplatná značka. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"<%(tag)s>\" na řádce %(line)s je neplatná značka. (Řádka začíná s \"%"
+"(start)s\".)"
 
 #: core/validators.py:479
 #, python-format
-msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
-msgstr "Značce na řádce %(line)s schází jeden nebo více požadovaných atributů. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Značce na řádce %(line)s schází jeden nebo více požadovaných atributů. "
+"(Řádka začíná s \"%(start)s\".)"
 
 #: core/validators.py:484
 #, python-format
-msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
-msgstr "Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s \"%(start)s\".)"
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s "
+"\"%(start)s\".)"
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Oddělte více identifikátorů čárkami."
 
-#: core/meta/fields.py:117
-msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Podržte  \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné položky."
-
+#: core/meta/fields.py:134
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Podržte  \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné "
+"položky."
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 17da2b8327..2955ee79bd 100644
Binary files a/django/conf/locale/cy/LC_MESSAGES/django.mo and b/django/conf/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index c855fe1612..73fe848c42 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-13 13:41-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
 "Last-Translator: Jason Davies <jason@jasondavies.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -16,6 +16,73 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "galluogi sylwadau"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "cynnwys"
+
+#: contrib/comments/views/comments.py:112
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
+msgstr ""
+
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
+msgstr ""
+
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr ""
+
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "amser gweithred"
@@ -44,8 +111,264 @@ msgstr "cofnod"
 msgid "log entries"
 msgstr "cofnodion"
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Mewngofnodi"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Ychwanegu"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Newidio"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Newidio"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Newid cyfrinair"
+
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "amser gweithred"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Dyddiad/amser"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "Cyfeiriad e-bost:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "Rhagfyr"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "cyfeiriad e-bost"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Rhowch rhif cyfan."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+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/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -55,7 +378,28 @@ msgstr "cofnodion"
 msgid "Home"
 msgstr "Adref"
 
+#: 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/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Hanes"
 
@@ -91,59 +435,6 @@ msgstr "Gweinyddiad safle Django"
 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:"
@@ -156,21 +447,32 @@ msgstr "Cyfrinair:"
 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/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Tudalen heb ei ddarganfod"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Croeso,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Newid cyfrinair"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Allgofnodi"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -195,6 +497,44 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Yndw, rwy'n sicr"
 
+#: 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/submit_line.html:3
+msgid "Delete"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "gweithredol"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+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
@@ -339,10 +679,6 @@ msgstr "ailgyfeiriad"
 msgid "redirects"
 msgstr "ailgyfeiriadau"
 
-#: contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr "URL"
-
 #: contrib/flatpages/models/flatpages.py:7
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -661,79 +997,79 @@ msgstr "Gwybodaeth personol"
 msgid "Important dates"
 msgstr "Dyddiadau pwysig"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Neges"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Tsieceg"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr "Cymraeg"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Almaeneg"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Saesneg"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Spaeneg"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Ffrangeg"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galisieg"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Eidaleg"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Norwyeg"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brasileg"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Rwsieg"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Serbeg"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Tsieinëeg Symledig"
 
@@ -1004,11 +1340,11 @@ msgstr ""
 "Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell "
 "yn ddechrau â \"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " Gwahanwch mwy nag un ID gyda atalnodau."
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index b56f3ff48a..344410ca3c 100644
Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index 9b9511ed73..f5b02c70f2 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -7,122 +7,118 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: 2005-10-08 00:03+0200\n"
 "Last-Translator: Georg Bauer <gb@bofh.ms>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr "Anonyme Benutzer k�nnen nicht abstimmen"
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr "Ung�ltige Kommentar-ID"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr "Keine Abstimmung bei Dir selber"
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+"Die Abstimmung ist zwangsweise, weil Du an mindestens einer anderen Abstimmung teilnimmst."
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
-"<h3>Nach %s:</h3>\n"
-"<ul>\n"
+"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s "
+"Kommentaren:\n"
+"\n"
+"%(text)s"
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
-msgstr "<h3>Nach %s:</h3><ul>\n"
+#: contrib/comments/views/comments.py:109
+msgid "count"
+msgstr "Anzahl"
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr "%s ausw�hlen"
-
-#: contrib/admin/views/main.py:211
-#, python-format
-msgid "Select %s to change"
-msgstr "%s zur �nderung ausw�hlen"
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugef�gt."
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr "Das Element kann jetzt weiter ge�ndert werden."
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr "Jetzt kann ein weiteres Element vom Typ %s angelegt werden."
-
-#: contrib/admin/views/main.py:600
-#, python-format
-msgid "Add %s"
-msgstr "%s zuf�gen"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr "%s hinzugef�gt."
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr "und"
-
-#: contrib/admin/views/main.py:618
-#, python-format
-msgid "Changed %s."
-msgstr "%s ge�ndert"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr "%s gel�scht."
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr "Keine Felder ge�ndert."
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich ge�ndert."
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
-"%(name)s \"%(obj)s\" wurde erfolgreich zugef�gt. Das Element kann jetzt "
-"ge�ndert werden."
+"Dieser Kommentar ist von einem nicht einsch�tzbaren Benutzer:\n"
+"\n"
+"%(text)s"
 
-#: contrib/admin/views/main.py:695
-#, python-format
-msgid "Change %s"
-msgstr "%s �ndern"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
+msgstr "Nur POST ist erlaubt"
 
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
+msgstr "Eines oder mehrere der erforderlichen Felder fehlt"
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Ein oder mehrere %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr "Jemand hat mit dem Kommentarformular herumgespielt (Sicherheitsverletzung)"
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gel�scht."
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"Das Kommentarformular hatte einen falschen 'target' Parameter -- die Objekt-ID ist ung�ltig."
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
-msgstr "Sicher? Ganz sicher?"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt"
 
-#: contrib/admin/views/main.py:827
-#, python-format
-msgid "Change history: %s"
-msgstr "�nderungsgeschichte: %s"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "Zeit der Aktion"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "Objekt ID"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "Objekt Darst."
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "Aktionskennzeichen"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "�nderungsmeldung"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "Logeintrag"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "Logeintr�ge"
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr "Alle Tage"
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -156,6 +152,118 @@ msgstr ""
 "Die eMail-Adresse ist nicht der Benutzername. Bitte '%s' stattdessen "
 "versuchen."
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Nach %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr "Alle"
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr "%s ausw�hlen"
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr "%s zur �nderung ausw�hlen"
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugef�gt."
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr "Das Element kann jetzt weiter ge�ndert werden."
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr "Jetzt kann ein weiteres Element vom Typ %s angelegt werden."
+
+#: contrib/admin/views/main.py:602
+#, python-format
+msgid "Add %s"
+msgstr "%s zuf�gen"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr "%s hinzugef�gt."
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr "und"
+
+#: contrib/admin/views/main.py:620
+#, python-format
+msgid "Changed %s."
+msgstr "%s ge�ndert"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr "%s gel�scht."
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr "Keine Felder ge�ndert."
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" wurde erfolgreich ge�ndert."
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"%(name)s \"%(obj)s\" wurde erfolgreich zugef�gt. Das Element kann jetzt "
+"ge�ndert werden."
+
+#: contrib/admin/views/main.py:697
+#, python-format
+msgid "Change %s"
+msgstr "%s �ndern"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s"
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Ein oder mehrere %(fieldname)s in %(name)s:"
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gel�scht."
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr "Sicher? Ganz sicher?"
+
+#: contrib/admin/views/main.py:829
+#, python-format
+msgid "Change history: %s"
+msgstr "�nderungsgeschichte: %s"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -219,7 +327,7 @@ msgstr "Text"
 msgid "Time"
 msgstr "Zeit"
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -231,56 +339,18 @@ msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)"
 msgid "XML text"
 msgstr "XML Text"
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django Systemverwaltung"
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr "Fehler in der Vorlage"
 
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Django Verwaltung"
-
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: 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/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 "Start"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Serverfehler"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Serverfehler (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Serverfehler <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/template_debug.html:8
 #, python-format
 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."
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
 msgstr ""
-"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per "
-"eMail weitergegeben und sollte bald behoben sein. Vielen Dank f�r Ihr "
-"Verst�ndnis."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Seite nicht gefunden"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr ""
-"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden."
+"\n"
+"Fehler in der Vorlage %(name)s, in Zeile %(line)s:\n"
 
 #: contrib/admin/templates/admin/index.html:27
 #: contrib/admin/templates/admin/change_form.html:14
@@ -307,6 +377,39 @@ msgstr "Meine Aktionen"
 msgid "None available"
 msgstr "Keine vorhanden"
 
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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 "Start"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Serverfehler"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Serverfehler (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Serverfehler <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 ""
+"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per "
+"eMail weitergegeben und sollte bald behoben sein. Vielen Dank f�r Ihr "
+"Verst�ndnis."
+
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -336,6 +439,14 @@ msgstr ""
 "Dieses Objekt hat keine �nderungsgeschichte. Es wurde m�glicherweise nicht "
 "�ber diese Verwaltungsseiten angelegt."
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django Systemverwaltung"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django Verwaltung"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Benutzername:"
@@ -348,17 +459,15 @@ msgstr "Passwort:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Haben Sie <a href=\"/password_reset/\">ihr Passwort vergessen</a>?"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Willkommen,"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Seite nicht gefunden"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Passwort �ndern"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Abmelden"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -378,26 +487,6 @@ msgstr "Sortierung"
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
-msgstr "L�schen"
-
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-msgstr "Als Neu sichern"
-
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-msgstr "Sichern und neu hinzuf�gen"
-
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-msgstr "Sichern und weiter bearbeiten"
-
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
-msgstr "Sichern"
-
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
 msgid ""
@@ -422,6 +511,43 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ja, ich bin sicher"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Willkommen,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Passwort �ndern"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Abmelden"
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "L�schen"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Als Neu sichern"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Sichern und neu hinzuf�gen"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Sichern und weiter bearbeiten"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Sichern"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr " Nach %(title)s "
+
 #: 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
@@ -537,37 +663,84 @@ msgstr "Vielen Dank, das Sie unsere Seiten benutzen!"
 msgid "The %(site_name)s team"
 msgstr "Das Team von %(site_name)s"
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "Zeit der Aktion"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "Umleitung von"
 
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "Objekt ID"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/"
+"events/search/'."
 
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "Objekt Darst."
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "Umleitung zu"
 
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "Aktionskennzeichen"
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Hier muss entweder ein absoluter Pfad oder eine komplette URL mit http:// am "
+"Anfang stehen."
 
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "�nderungsmeldung"
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "Umleitung"
 
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "Logeintrag"
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "Umleitungen"
 
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "Logeintr�ge"
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Beispiel: '/about/contact/'. Wichtig: vorne und hinten muss ein / stehen."
 
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
-msgstr "Alle Tage"
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "Titel"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "Inhalt"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "Kommentare aktivieren"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "Name der Vorlage"
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Beispiel: 'flatpages/contact_page'. Wenn dieses Feld nicht gef�llt ist, wird "
+"'flatpages/default' als Standard gew�hlt."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "Registrierung erforderlich"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Wenn hier ein Haken ist, k�nnen nur angemeldete Benutzer diese Seite sehen."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "Webseite"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "Webseiten"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
@@ -729,86 +902,7 @@ msgstr "Inhaltstyp"
 msgid "content types"
 msgstr "Inhaltstypen"
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr "Umleitung von"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/"
-"events/search/'."
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "Umleitung zu"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Hier muss entweder ein absoluter Pfad oder eine komplette URL mit http:// am "
-"Anfang stehen."
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "Umleitung"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "Umleitungen"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Beispiel: '/about/contact/'. Wichtig: vorne und hinten muss ein / stehen."
-
-#: models/core.py:89
-msgid "title"
-msgstr "Titel"
-
-#: models/core.py:90
-msgid "content"
-msgstr "Inhalt"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "Kommentare aktivieren"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "Name der Vorlage"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"Beispiel: 'flatfiles/contact_page'. Wenn dieses Feld nicht gef�llt ist, wird "
-"'flatfiles/default' als Standard gew�hlt."
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "Registrierung erforderlich"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Wenn hier ein Haken ist, k�nnen nur angemeldete Benutzer diese Seite sehen."
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "Webseite"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "Webseiten"
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr "Sitzungs-ID"
 
@@ -917,7 +1011,7 @@ msgstr "Pers
 msgid "Important dates"
 msgstr "Wichtige Daten"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Mitteilung"
 
@@ -925,66 +1019,74 @@ msgstr "Mitteilung"
 msgid "Bengali"
 msgstr "Bengali"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr "Walisisch"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Deutsch"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Englisch"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Franz�sisch"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galicisch"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr "Isl�ndisch"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Italienisch"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brasilianisch"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
+msgid "Romanian"
+msgstr "Rum�nisch"
+
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Russisch"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
+msgid "Slovak"
+msgstr "Slowakisch"
+
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
+msgid "Swedish"
+msgstr "Schwedisch"
+
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: conf/global_settings.py:49
-msgid "Slovak"
-msgstr "Slowakisch"
-
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
@@ -1258,13 +1360,16 @@ msgstr ""
 "Das Attribut %(attr)s in Zeile %(line)s hat einen ung�ltigen Wert. Die Zeile "
 "beginnt mit \"%(start)s\"."
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Mehrere IDs k�nnen mit Komma getrennt werden."
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command"
 "\", beim Klicken gedr�ckt halten."
+
+#~ msgid "<h3>By %s:</h3><ul>\n"
+#~ msgstr "<h3>Nach %s:</h3><ul>\n"
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index 437ad22e3e..95b156d9a1 100644
Binary files a/django/conf/locale/en/LC_MESSAGES/django.mo and b/django/conf/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 6810873326..efca886fd1 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,110 +16,101 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr ""
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
+#: contrib/comments/views/comments.py:109
+msgid "count"
 msgstr ""
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, python-format
-msgid "Select %s to change"
-msgstr ""
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, python-format
-msgid "Add %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, python-format
-msgid "Changed %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, python-format
-msgid "Change %s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, python-format
-msgid "Change history: %s"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr ""
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr ""
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr ""
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
 msgstr ""
 
 #: contrib/admin/views/decorators.py:22
@@ -148,6 +139,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, python-format
+msgid "Changed %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, python-format
+msgid "Change %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, python-format
+msgid "Change history: %s"
+msgstr ""
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -211,7 +310,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr ""
 
@@ -223,37 +322,15 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr ""
-
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
-#: 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 ""
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr ""
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr ""
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
 msgstr ""
 
 #: contrib/admin/templates/admin/index.html:27
@@ -281,6 +358,36 @@ msgstr ""
 msgid "None available"
 msgstr ""
 
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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 ""
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr ""
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr ""
+
+#: 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/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -308,6 +415,14 @@ msgid ""
 "admin site."
 msgstr ""
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr ""
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr ""
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr ""
@@ -320,38 +435,13 @@ msgstr ""
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-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/500.html:6
-msgid "Server error (500)"
-msgstr ""
-
-#: 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."
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
 msgstr ""
 
 #: contrib/admin/templates/admin/change_form.html:20
@@ -372,6 +462,37 @@ msgstr ""
 msgid "Order:"
 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/admin/base.html:23
+msgid "Welcome,"
+msgstr ""
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr ""
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr ""
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -392,15 +513,9 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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"
+msgid " By %(title)s "
 msgstr ""
 
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -511,32 +626,75 @@ msgstr ""
 msgid "The %(site_name)s team"
 msgstr ""
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
 msgstr ""
 
-#: contrib/admin/models/admin.py:9
-msgid "object id"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
 
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
 msgstr ""
 
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
 msgstr ""
 
-#: contrib/admin/models/admin.py:12
-msgid "change message"
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
 msgstr ""
 
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
 msgstr ""
 
 #: utils/translation.py:335
@@ -699,78 +857,7 @@ msgstr ""
 msgid "content types"
 msgstr ""
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr ""
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr ""
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-
-#: models/core.py:73
-msgid "redirect"
-msgstr ""
-
-#: models/core.py:74
-msgid "redirects"
-msgstr ""
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-
-#: models/core.py:89
-msgid "title"
-msgstr ""
-
-#: models/core.py:90
-msgid "content"
-msgstr ""
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr ""
-
-#: models/core.py:92
-msgid "template name"
-msgstr ""
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-
-#: models/core.py:94
-msgid "registration required"
-msgstr ""
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-
-#: models/core.py:98
-msgid "flat page"
-msgstr ""
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr ""
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr ""
 
@@ -876,7 +963,7 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr ""
 
@@ -884,71 +971,71 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -1197,11 +1284,11 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index ad702e0655..2a42443334 100644
Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index eaa96877f3..6a366fc5f4 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: 2005-10-04 20:59GMT\n"
 "Last-Translator: Ricardo Javier C�rdenes Medina <ricardo.cardenes@gmail."
 "com>\n"
@@ -17,111 +17,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr ""
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
+#: contrib/comments/views/comments.py:109
+msgid "count"
 msgstr ""
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, fuzzy, python-format
-msgid "Select %s to change"
-msgstr "Cambie para modificar"
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "Agregar"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "Modificar"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "Modificar"
-
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "Cambiar clave"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/admin/models/admin.py:6
+#, fuzzy
+msgid "action time"
+msgstr "Fecha/hora"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr ""
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr ""
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -149,6 +141,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Cambie para modificar"
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Agregar"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Cambiar clave"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -216,7 +316,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr ""
 
@@ -228,18 +328,48 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Sitio de administraci�n de Django"
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administraci�n de Django"
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
 
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Agregar"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modificar"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "No tiene permiso para editar nada."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Acciones recientes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mis acciones"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ninguno disponible"
+
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/logged_out.html:4
 #: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -268,40 +398,6 @@ msgstr ""
 "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/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Lo sentimos, pero no se encuentra la p�gina solicitada."
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Agregar"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modificar"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "No tiene permiso para editar nada."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Acciones recientes"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mis acciones"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ninguno disponible"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -331,6 +427,14 @@ msgstr ""
 "Este objeto no tiene hist�rico de cambios. Probablemente no fue a�adido "
 "usando este sitio de administraci�n."
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Sitio de administraci�n de Django"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administraci�n de Django"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Usuario:"
@@ -343,28 +447,14 @@ msgstr "Clave:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "�Ha <a href=\"/password_reset/\">olvidado su clave</a>?"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bienvenido,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Cambiar clave"
-
-#: 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/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Lo sentimos, pero no se encuentra la p�gina solicitada."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -384,6 +474,42 @@ msgstr ""
 msgid "Order:"
 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 ""
+"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/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bienvenido,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambiar clave"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Terminar"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -404,18 +530,10 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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:"
+msgid " By %(title)s "
 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
@@ -531,37 +649,75 @@ msgstr "
 msgid "The %(site_name)s team"
 msgstr "El equipo de %(site_name)s"
 
-#: contrib/admin/models/admin.py:6
-#, fuzzy
-msgid "action time"
-msgstr "Fecha/hora"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
 msgstr ""
 
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
 
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
 msgstr ""
 
-#: contrib/admin/models/admin.py:12
-msgid "change message"
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
 msgstr ""
 
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
 msgstr ""
 
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
 msgstr ""
 
 #: utils/translation.py:335
@@ -725,78 +881,7 @@ msgstr ""
 msgid "content types"
 msgstr ""
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr ""
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr ""
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-
-#: models/core.py:73
-msgid "redirect"
-msgstr ""
-
-#: models/core.py:74
-msgid "redirects"
-msgstr ""
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-
-#: models/core.py:89
-msgid "title"
-msgstr ""
-
-#: models/core.py:90
-msgid "content"
-msgstr ""
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr ""
-
-#: models/core.py:92
-msgid "template name"
-msgstr ""
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-
-#: models/core.py:94
-msgid "registration required"
-msgstr ""
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-
-#: models/core.py:98
-msgid "flat page"
-msgstr ""
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr ""
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr ""
 
@@ -906,7 +991,7 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr ""
 
@@ -914,71 +999,71 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -1229,11 +1314,11 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 247e15de91..425072c09e 100644
Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 166d1161e8..943f215bb4 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: 2005-10-18 12:27+0200\n"
 "Last-Translator: Laurent Rahuel <laurent.rahuel@gmail.com>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
@@ -15,111 +15,104 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "autoriser les commentaires"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
-msgstr ""
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "contenu"
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, python-format
-msgid "Select %s to change"
-msgstr ""
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "Ajouter"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "Modifier"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "Modifier"
-
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "Modifier votre mot de passe"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "heure de l'action"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id de l'objet"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr de l'objet"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "drapeau de l'action"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "message de modification"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "entr�e de log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "entr�es de log"
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -147,6 +140,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Ajouter"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modifier"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modifier"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Modifier votre mot de passe"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -216,7 +317,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -228,18 +329,48 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Site d'administration de Django"
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administration de Django"
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
 
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Ajouter"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modifier"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Vous n'avez pas la permission d'�diter quoi que ce soit."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Actions r�centes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mes actions"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Aucun(e) disponible"
+
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/logged_out.html:4
 #: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -268,40 +399,6 @@ msgstr ""
 "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/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Nous sommes d�sol�s, mais la page demand�e est introuvable."
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Ajouter"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modifier"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Vous n'avez pas la permission d'�diter quoi que ce soit."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Actions r�centes"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mes actions"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Aucun(e) disponible"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -331,6 +428,14 @@ msgstr ""
 "Cet objet n'a pas d'historique de modification. Il n'a probablement pas �t� "
 "ajout� au moyen de ce site d'administration."
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Site d'administration de Django"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administration de Django"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Nom d'utilisateur"
@@ -343,28 +448,14 @@ msgstr "Mot de passe"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Avez vous <a href=\"/password_reset/\">perdu votre mot de passe</a>?"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bienvenue,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Modifier votre mot de passe"
-
-#: 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/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Nous sommes d�sol�s, mais la page demand�e est introuvable."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -384,6 +475,42 @@ msgstr ""
 msgid "Order:"
 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 ""
+"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/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bienvenue,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Modifier votre mot de passe"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "D�connection"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -405,18 +532,10 @@ msgstr ""
 msgid "Save"
 msgstr "actif"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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:"
+msgid " By %(title)s "
 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
@@ -535,37 +654,87 @@ msgstr "Merci d'utiliser notre site!"
 msgid "The %(site_name)s team"
 msgstr "L'�quipe %(site_name)s"
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "heure de l'action"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "redirig� depuis"
 
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id de l'objet"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "repr de l'objet"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "drapeau de l'action"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "message de modification"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "entr�e de log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "entr�es de log"
-
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
+"Ceci doit �tre un chemin absolu, sans nom de domaine. Par exemple: '/events/"
+"search/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "redirig� vers"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Ceci peut �tre soit un chemin absolu (voir ci-dessus) soit une URL compl�te "
+"d�butant par 'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "redirection"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "redirections"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Par exemple : '/about/contact/'. V�rifiez la pr�sence du caract�re '/' en "
+"d�but et en fin de chaine."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "titre"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "contenu"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "autoriser les commentaires"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "nom du template"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Par exemple: 'flatfiles/contact_page'. Sans d�finition, le syst�me utilisera "
+"'flatfiles/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "enregistrement requis"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Si coch�, seuls les utilisateurs connect�s auront la possibilit� de voir "
+"cette page."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "page � plat"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "pages � plat"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
@@ -727,88 +896,7 @@ msgstr "type de contenu"
 msgid "content types"
 msgstr "types de contenu"
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr "redirig� depuis"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Ceci doit �tre un chemin absolu, sans nom de domaine. Par exemple: '/events/"
-"search/'."
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "redirig� vers"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Ceci peut �tre soit un chemin absolu (voir ci-dessus) soit une URL compl�te "
-"d�butant par 'http://'."
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "redirection"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "redirections"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Par exemple : '/about/contact/'. V�rifiez la pr�sence du caract�re '/' en "
-"d�but et en fin de chaine."
-
-#: models/core.py:89
-msgid "title"
-msgstr "titre"
-
-#: models/core.py:90
-msgid "content"
-msgstr "contenu"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "autoriser les commentaires"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "nom du template"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"Par exemple: 'flatfiles/contact_page'. Sans d�finition, le syst�me utilisera "
-"'flatfiles/default'."
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "enregistrement requis"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Si coch�, seuls les utilisateurs connect�s auront la possibilit� de voir "
-"cette page."
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "page � plat"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "pages � plat"
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr "cl� de session"
 
@@ -917,7 +1005,7 @@ msgstr "Information personnelle"
 msgid "Important dates"
 msgstr "Dates importantes"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Message"
 
@@ -925,66 +1013,74 @@ msgstr "Message"
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Tch�que"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Allemand"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Anglais"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Fran�ais"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galicien"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 #, fuzzy
 msgid "Italian"
 msgstr "Italien"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Br�silien"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Russe"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:52
 #, fuzzy
 msgid "Serbian"
 msgstr "Serbe"
 
-#: conf/global_settings.py:48
-msgid "Simplified Chinese"
+#: conf/global_settings.py:53
+msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:49
-msgid "Slovak"
+#: conf/global_settings.py:54
+msgid "Simplified Chinese"
 msgstr ""
 
 #: core/validators.py:59
@@ -1261,11 +1357,11 @@ msgstr ""
 "La valeur de l'attribut \"%(attr)s\" de la ligne %(line)s n'est pas valide. "
 "(Ligne d�butant par \"%(start)s\".)"
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "S�parez les ID par des virgules."
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index 4f78d05d9d..96afb28db9 100644
Binary files a/django/conf/locale/gl/LC_MESSAGES/django.mo and b/django/conf/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index e16dfe5807..387626df74 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.po
+++ b/django/conf/locale/gl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 18:22+0100\n"
+"POT-Creation-Date: 2005-11-15 13:35+0100\n"
 "PO-Revision-Date: 2005-10-16 14:29+0100\n"
 "Last-Translator: Afonso Fernández Nogueira <fonzzo.django@gmail.com>\n"
 "Language-Team: Galego\n"
@@ -17,6 +17,71 @@ msgstr ""
 "X-Poedit-Language: Galician\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr ""
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:109
+msgid "count"
+msgstr ""
+
+#: contrib/comments/views/comments.py:112
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
+msgstr ""
+
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
+msgstr ""
+
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr ""
+
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 #, fuzzy
 msgid "action time"
@@ -46,7 +111,7 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:256
+#: contrib/admin/templatetags/admin_list.py:282
 msgid "All dates"
 msgstr ""
 
@@ -76,108 +141,110 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/admin/views/main.py:84
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
 "<ul>\n"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
 msgstr ""
 
-#: contrib/admin/views/main.py:210
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:211
+#: contrib/admin/views/main.py:209
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Faga clic para modificar"
 
-#: contrib/admin/views/main.py:567
+#: contrib/admin/views/main.py:572
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:597
+#: contrib/admin/views/main.py:602
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Engadir"
 
-#: contrib/admin/views/main.py:613
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
-#: contrib/admin/views/main.py:617
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:620
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:617
+#: contrib/admin/views/main.py:622
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:625
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:645
+#: contrib/admin/views/main.py:650
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:654
+#: contrib/admin/views/main.py:659
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:692
+#: contrib/admin/views/main.py:697
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:772
+#: contrib/admin/views/main.py:777
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:782
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:806
+#: contrib/admin/views/main.py:811
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:809
+#: contrib/admin/views/main.py:814
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:824
+#: contrib/admin/views/main.py:829
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Cambiar contrasinal"
@@ -249,8 +316,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:81
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr ""
 
@@ -262,6 +328,17 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
+
 #: contrib/admin/templates/admin/index.html:27
 #: contrib/admin/templates/admin/change_form.html:14
 msgid "Add"
@@ -287,10 +364,12 @@ msgstr "As miñas accións"
 msgid "None available"
 msgstr "Ningunha dispoñíbel"
 
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -405,6 +484,19 @@ msgstr ""
 "relacionados, pero a súa conta non ten permiso para borrar os seguintes "
 "tipos de obxectos:"
 
+#: 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 ""
+"Seguro que quere borrar o %(object_name)s \"%(object)s\"? Eliminaranse os "
+"seguintes obxectos relacionados:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Si, estou seguro"
+
 #: contrib/admin/templates/admin/base.html:23
 msgid "Welcome,"
 msgstr "Benvido,"
@@ -437,18 +529,10 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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:"
+msgid " By %(title)s "
 msgstr ""
-"Seguro que quere borrar o %(object_name)s \"%(object)s\"? Eliminaranse os "
-"seguintes obxectos relacionados:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Si, estou seguro"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -564,52 +648,52 @@ msgstr "Grazas por usar o noso sitio web!"
 msgid "The %(site_name)s team"
 msgstr "O equipo de %(site_name)s"
 
-#: contrib/redirects/models/redirects.py:7 models/core.py:62
+#: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr ""
 
-#: contrib/redirects/models/redirects.py:8 models/core.py:63
+#: contrib/redirects/models/redirects.py:8
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
 
-#: contrib/redirects/models/redirects.py:9 models/core.py:64
+#: contrib/redirects/models/redirects.py:9
 msgid "redirect to"
 msgstr ""
 
-#: contrib/redirects/models/redirects.py:10 models/core.py:65
+#: contrib/redirects/models/redirects.py:10
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
 
-#: contrib/redirects/models/redirects.py:12 models/core.py:67
+#: contrib/redirects/models/redirects.py:12
 msgid "redirect"
 msgstr ""
 
-#: contrib/redirects/models/redirects.py:13 models/core.py:68
+#: contrib/redirects/models/redirects.py:13
 msgid "redirects"
 msgstr ""
 
-#: contrib/flatpages/models/flatpages.py:7 models/core.py:82
+#: contrib/flatpages/models/flatpages.py:7
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
 
-#: contrib/flatpages/models/flatpages.py:8 models/core.py:83
+#: contrib/flatpages/models/flatpages.py:8
 msgid "title"
 msgstr ""
 
-#: contrib/flatpages/models/flatpages.py:9 models/core.py:84
+#: contrib/flatpages/models/flatpages.py:9
 msgid "content"
 msgstr ""
 
-#: contrib/flatpages/models/flatpages.py:10 models/core.py:85
+#: contrib/flatpages/models/flatpages.py:10
 msgid "enable comments"
 msgstr ""
 
-#: contrib/flatpages/models/flatpages.py:11 models/core.py:86
+#: contrib/flatpages/models/flatpages.py:11
 msgid "template name"
 msgstr ""
 
@@ -619,19 +703,19 @@ msgid ""
 "use 'flatpages/default'."
 msgstr ""
 
-#: contrib/flatpages/models/flatpages.py:13 models/core.py:88
+#: contrib/flatpages/models/flatpages.py:13
 msgid "registration required"
 msgstr ""
 
-#: contrib/flatpages/models/flatpages.py:13 models/core.py:88
+#: contrib/flatpages/models/flatpages.py:13
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 
-#: contrib/flatpages/models/flatpages.py:17 models/core.py:92
+#: contrib/flatpages/models/flatpages.py:17
 msgid "flat page"
 msgstr ""
 
-#: contrib/flatpages/models/flatpages.py:18 models/core.py:93
+#: contrib/flatpages/models/flatpages.py:18
 msgid "flat pages"
 msgstr ""
 
@@ -751,74 +835,68 @@ msgstr ""
 msgid "Dec."
 msgstr ""
 
-#: models/core.py:5
+#: models/core.py:7
 msgid "domain name"
 msgstr ""
 
-#: models/core.py:6
+#: models/core.py:8
 msgid "display name"
 msgstr ""
 
-#: models/core.py:8
+#: models/core.py:10
 msgid "site"
 msgstr ""
 
-#: models/core.py:9
+#: models/core.py:11
 msgid "sites"
 msgstr ""
 
-#: models/core.py:22
+#: models/core.py:28
 msgid "label"
 msgstr ""
 
-#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
 #, fuzzy
 msgid "name"
 msgstr "Usuario:"
 
-#: models/core.py:25
+#: models/core.py:31
 msgid "package"
 msgstr ""
 
-#: models/core.py:26
+#: models/core.py:32
 msgid "packages"
 msgstr ""
 
-#: models/core.py:36
+#: models/core.py:42
 msgid "python module name"
 msgstr ""
 
-#: models/core.py:38
+#: models/core.py:44
 msgid "content type"
 msgstr ""
 
-#: models/core.py:39
+#: models/core.py:45
 msgid "content types"
 msgstr ""
 
-#: models/core.py:87
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-
-#: models/core.py:114
+#: models/core.py:67
 msgid "session key"
 msgstr ""
 
-#: models/core.py:115
+#: models/core.py:68
 msgid "session data"
 msgstr ""
 
-#: models/core.py:116
+#: models/core.py:69
 msgid "expire date"
 msgstr ""
 
-#: models/core.py:118
+#: models/core.py:71
 msgid "session"
 msgstr ""
 
-#: models/core.py:119
+#: models/core.py:72
 msgid "sessions"
 msgstr ""
 
@@ -912,7 +990,7 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr ""
 
@@ -920,219 +998,235 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr ""
 
-#: core/validators.py:58
+#: conf/global_settings.py:51
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:52
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:54
+msgid "Simplified Chinese"
+msgstr ""
+
+#: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Este valor soamente pode conter letras, números e guións baixos (_)."
 
-#: core/validators.py:62
+#: core/validators.py:63
 #, fuzzy
 msgid "This value must contain only letters, numbers, underscores and slashes."
 msgstr "Este valor soamente pode conter letras, números e guións baixos (_)."
 
-#: core/validators.py:70
+#: core/validators.py:71
 msgid "Uppercase letters are not allowed here."
 msgstr ""
 
-#: core/validators.py:74
+#: core/validators.py:75
 msgid "Lowercase letters are not allowed here."
 msgstr ""
 
-#: core/validators.py:81
+#: core/validators.py:82
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: core/validators.py:93
+#: core/validators.py:94
 msgid "Enter valid e-mail addresses separated by commas."
 msgstr ""
 
-#: core/validators.py:100
+#: core/validators.py:98
 msgid "Please enter a valid IP address."
 msgstr ""
 
-#: core/validators.py:104
+#: core/validators.py:102
 msgid "Empty values are not allowed here."
 msgstr ""
 
-#: core/validators.py:108
+#: core/validators.py:106
 msgid "Non-numeric characters aren't allowed here."
 msgstr ""
 
-#: core/validators.py:112
+#: core/validators.py:110
 msgid "This value can't be comprised solely of digits."
 msgstr ""
 
-#: core/validators.py:117
+#: core/validators.py:115
 msgid "Enter a whole number."
 msgstr ""
 
-#: core/validators.py:121
+#: core/validators.py:119
 msgid "Only alphabetical characters are allowed here."
 msgstr ""
 
-#: core/validators.py:125
+#: core/validators.py:123
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr ""
 
-#: core/validators.py:129
+#: core/validators.py:127
 msgid "Enter a valid time in HH:MM format."
 msgstr ""
 
-#: core/validators.py:133
+#: core/validators.py:131
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
 msgstr ""
 
-#: core/validators.py:137
+#: core/validators.py:135
 #, fuzzy
 msgid "Enter a valid e-mail address."
 msgstr "Enderezo de correo electrónico:"
 
-#: core/validators.py:149
+#: core/validators.py:147
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: core/validators.py:156
+#: core/validators.py:154
 #, python-format
 msgid "The URL %s does not point to a valid image."
 msgstr ""
 
-#: core/validators.py:160
+#: core/validators.py:158
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr ""
 
-#: core/validators.py:168
+#: core/validators.py:166
 #, python-format
 msgid "The URL %s does not point to a valid QuickTime video."
 msgstr ""
 
-#: core/validators.py:172
+#: core/validators.py:170
 msgid "A valid URL is required."
 msgstr ""
 
-#: core/validators.py:186
+#: core/validators.py:184
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
 "%s"
 msgstr ""
 
-#: core/validators.py:193
+#: core/validators.py:191
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr ""
 
-#: core/validators.py:203
+#: core/validators.py:201
 #, python-format
 msgid "Invalid URL: %s"
 msgstr ""
 
-#: core/validators.py:205
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr ""
 
-#: core/validators.py:211
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr ""
 
-#: core/validators.py:226
+#: core/validators.py:228
 #, 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] ""
 msgstr[1] ""
 
-#: core/validators.py:233
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr ""
 
-#: core/validators.py:252
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr ""
 
-#: core/validators.py:261 core/validators.py:272
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr ""
 
-#: core/validators.py:279
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr ""
 
-#: core/validators.py:291
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""
 
-#: core/validators.py:310
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr ""
 
-#: core/validators.py:333
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr ""
 
-#: core/validators.py:344
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr ""
 
-#: core/validators.py:346
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -1140,7 +1234,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:349
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -1148,82 +1242,82 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:359
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""
 
-#: core/validators.py:360
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""
 
-#: core/validators.py:373
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr ""
 
-#: core/validators.py:388
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr ""
 
-#: core/validators.py:423
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr ""
 
-#: core/validators.py:426
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 
-#: core/validators.py:459
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
 "\"%(start)s\".)"
 msgstr ""
 
-#: core/validators.py:463
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/validators.py:468
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""
 
-#: core/validators.py:473
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""
 
-#: core/validators.py:477
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/validators.py:482
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 184eea6000..3136c5a7c2 100644
Binary files a/django/conf/locale/is/LC_MESSAGES/django.mo and b/django/conf/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index d1dba14849..2f3f20ea53 100644
--- a/django/conf/locale/is/LC_MESSAGES/django.po
+++ b/django/conf/locale/is/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-13 13:41-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: 2005-11-13 18:08-0000\n"
 "Last-Translator: Dagur Páll Ammendrup <dagurp@gmail.com>\n"
 "Language-Team:  <dagurp@gmail.com>\n"
@@ -18,6 +18,73 @@ msgstr ""
 "X-Poedit-Country: ICELAND\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "virkja athugasemdir"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "innihald"
+
+#: contrib/comments/views/comments.py:112
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
+msgstr ""
+
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
+msgstr ""
+
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr ""
+
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "tími aðgerðar"
@@ -46,8 +113,264 @@ msgstr "kladdafærsla"
 msgid "log entries"
 msgstr "kladdafærslur"
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Skrá inn"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Bæta við"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Breyta"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Breyta"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Breyta lykilorði"
+
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "tími aðgerðar"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Dagsetning/tími"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "Tölvupóstfang:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "desember"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "tölvupóstfang"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Settu inn heila tölu."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "veffang"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Bæta við"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Breyta"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Þú hefur ekki réttindi til að breyta nokkru"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Nýlega framkvæmdar aðgerðir"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Aðgerðir mínar"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Engin fáanleg"
+
 #: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -57,7 +380,28 @@ msgstr "kladdafærslur"
 msgid "Home"
 msgstr "Heim"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Kerfisvilla"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Kerfisvilla (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Kerfisvilla <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 ""
+"Villa hefur komið upp. Hún hefur verið tilkynnt vefstjórunum með tölvupósti "
+"og ætti að verða lagað fljótlega. Þökkum þolinmæðina."
+
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Saga"
 
@@ -93,59 +437,6 @@ msgstr "Django vefstjóri"
 msgid "Django administration"
 msgstr "Django vefstjórn"
 
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Kerfisvilla"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Kerfisvilla (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Kerfisvilla <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 ""
-"Villa hefur komið upp. Hún hefur verið tilkynnt vefstjórunum með tölvupósti "
-"og ætti að verða lagað fljótlega. Þökkum þolinmæðina."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Síða fannst ekki"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Því miður fannst umbeðin síða ekki."
-
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Bæta við"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Breyta"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Þú hefur ekki réttindi til að breyta nokkru"
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Nýlega framkvæmdar aðgerðir"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Aðgerðir mínar"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Engin fáanleg"
-
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Notandanafn:"
@@ -158,21 +449,32 @@ msgstr "Lykilorð:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">Gleymdir þú lykilorðinu</a> þínu?"
 
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Skrá inn"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Síða fannst ekki"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Velkomin(n),"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Því miður fannst umbeðin síða ekki."
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Breyta lykilorði"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Skrá út"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -197,6 +499,44 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Já ég er viss."
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Velkomin(n),"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Breyta lykilorði"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Skrá út"
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "virkur"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+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
@@ -344,10 +684,6 @@ msgstr "beining"
 msgid "redirects"
 msgstr "beiningar"
 
-#: contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr "veffang"
-
 #: contrib/flatpages/models/flatpages.py:7
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -663,79 +999,79 @@ msgstr "Persónuupplýsingar"
 msgid "Important dates"
 msgstr "Mikilvægar dagsetningar"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Skilaboð"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Bengali"
 msgstr "Bengalska"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Tékkneska"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr "Velska"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Þýska"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Enska"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Spænska"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Franska"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galíska"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Ítalska"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Norska"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brasilíska"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr "Rúmenska"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Rússneska"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Slovak"
 msgstr "Slóvanska"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Serbíska"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Einfölduð Kínverska "
 
@@ -1001,11 +1337,11 @@ msgstr ""
 "\"%(attr)s\" eigindið á línu %(line)s hefur ótækt gildi (línan hefst á \"%"
 "(start)s\")."
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Notaðu kommur til að aðskilja kenni."
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index ec8cda4ce9..539ae73f81 100644
Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 27f2c83c1d..9de248ef25 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,111 +16,104 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "abilita commenti"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
-msgstr ""
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "contenuto"
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, fuzzy, python-format
-msgid "Select %s to change"
-msgstr "Clicca per cambiare"
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "Aggiungi"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "Cambia"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "Cambia"
-
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "Cambia la password"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "data azione"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id dell'oggetto"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "rappresentazione dell'oggetto"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "flag azione"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "messaggio"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "voce di log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "voci di log"
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -148,6 +141,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Clicca per cambiare"
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Aggiungi"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Cambia"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Cambia"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Cambia la password"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -217,7 +318,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -229,18 +330,48 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Amministrazione sito Django"
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Amministrazione Django"
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
 
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Aggiungi"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Cambia"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Non hai i permessi di modificare nulla."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Azioni Recenti"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Azioni Proprie"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nessuna disponibile"
+
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/logged_out.html:4
 #: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -268,40 +399,6 @@ 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/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Spiacente, ma la pagina richiesta non esiste."
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Aggiungi"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Cambia"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Non hai i permessi di modificare nulla."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Azioni Recenti"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Azioni Proprie"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nessuna disponibile"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -331,6 +428,14 @@ msgstr ""
 "Questo oggetto non ha cambiamenti storicizzati. Probabilmente non � stato "
 "creato con questo sito di amministrazione."
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Amministrazione sito Django"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Amministrazione Django"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Nome utente:"
@@ -343,28 +448,14 @@ msgstr "Password:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Hai <a href=\"/password_reset/\">dimenticato la tua password</a>?"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Benvenuto,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Cambia la password"
-
-#: 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/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Spiacente, ma la pagina richiesta non esiste."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -384,6 +475,42 @@ msgstr ""
 msgid "Order:"
 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 ""
+"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/admin/base.html:23
+msgid "Welcome,"
+msgstr "Benvenuto,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambia la password"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Esci"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -405,18 +532,10 @@ msgstr ""
 msgid "Save"
 msgstr "attivo"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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:"
+msgid " By %(title)s "
 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
@@ -533,37 +652,83 @@ msgstr "Ti ringraziamo per l'utilizzo del nostro sito!"
 msgid "The %(site_name)s team"
 msgstr "Il team di %(site_name)s"
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "data azione"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "redirigi da"
 
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id dell'oggetto"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "rappresentazione dell'oggetto"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "flag azione"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "messaggio"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "voce di log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "voci di log"
-
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
+"Un percorso assoluto, senza nome a dominio. Esempio: '/events/search/'.Un "
+"percorso assoluto, senza nome a dominio. Esempio: '/events/search/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "redirigi verso"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Un percorso assoluto (come sopra) o un URL completa che inizi con 'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "redirigi"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "redirezioni"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Esempio: '/about/contact/'. Attenzione alla barra ('/') iniziale e finale."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "titolo"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "contenuto"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "abilita commenti"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "nome modello"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Esempio: 'flatfiles/contact_page'. Se non specificato, il sistema user� "
+"'flatfiles/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "registrazione obbligatoria"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "Se selezionata, solo gli utenti registrati potranno vedere la pagina."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "pagina statica"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "pagine statiche"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
@@ -725,84 +890,7 @@ msgstr "tipo di contenuto"
 msgid "content types"
 msgstr "tipo di contenuti"
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr "redirigi da"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Un percorso assoluto, senza nome a dominio. Esempio: '/events/search/'.Un "
-"percorso assoluto, senza nome a dominio. Esempio: '/events/search/'."
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "redirigi verso"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Un percorso assoluto (come sopra) o un URL completa che inizi con 'http://'."
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "redirigi"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "redirezioni"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Esempio: '/about/contact/'. Attenzione alla barra ('/') iniziale e finale."
-
-#: models/core.py:89
-msgid "title"
-msgstr "titolo"
-
-#: models/core.py:90
-msgid "content"
-msgstr "contenuto"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "abilita commenti"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "nome modello"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"Esempio: 'flatfiles/contact_page'. Se non specificato, il sistema user� "
-"'flatfiles/default'."
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "registrazione obbligatoria"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Se selezionata, solo gli utenti registrati potranno vedere la pagina."
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "pagina statica"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "pagine statiche"
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr "chiave di sessione"
 
@@ -910,7 +998,7 @@ msgstr "Informazioni personali"
 msgid "Important dates"
 msgstr "Date importanti"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Messaggio"
 
@@ -918,65 +1006,73 @@ msgstr "Messaggio"
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Tedesco"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Inglese"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Francese"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galiziano"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brasiliano"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Russo"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:52
 #, fuzzy
 msgid "Serbian"
 msgstr "Serbo"
 
-#: conf/global_settings.py:48
-msgid "Simplified Chinese"
+#: conf/global_settings.py:53
+msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:49
-msgid "Slovak"
+#: conf/global_settings.py:54
+msgid "Simplified Chinese"
 msgstr ""
 
 #: core/validators.py:59
@@ -1243,11 +1339,11 @@ msgstr ""
 "L'attributo \"%(attr)s\" alla linea %(line)s ha un valore non valido. (La "
 "linea comincia con \"%(start)s\".)"
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " Separa ID multipli con virgole."
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr " Premi \"Control\", o \"Command\" su Mac, per selezionarne pi� di uno."
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index 3d99a00f08..e16c9bed1a 100644
Binary files a/django/conf/locale/no/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index b2aca96812..b87482f180 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
 "Language-Team: Norwegian\n"
@@ -16,111 +16,104 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "tillat kommentarer"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
-msgstr ""
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "innhold"
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, python-format
-msgid "Select %s to change"
-msgstr ""
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "Legg til"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "Endre"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "Endre"
-
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "Endre passord"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "handlings tid"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "objekt id"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "objekt repr"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "handlings flagg"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "endre melding"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "logg notis"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "logg innlegg"
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -148,6 +141,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Legg til"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Endre"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Endre"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Endre passord"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -217,7 +318,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "Internettadresse"
 
@@ -229,52 +330,16 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django administrasjonsside"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Django administrasjon"
-
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: 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/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 "Hjem"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Tjener feil"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Tjener feil (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-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."
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
 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/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Beklager, men siden du spør etter finnest ikke."
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
 
 #: contrib/admin/templates/admin/index.html:27
 #: contrib/admin/templates/admin/change_form.html:14
@@ -301,6 +366,38 @@ msgstr "Mine handlinger"
 msgid "None available"
 msgstr "Ingen tilgjengelige"
 
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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 "Hjem"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Tjener feil"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Tjener feil (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+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/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -330,6 +427,14 @@ msgstr ""
 "Dette objektet har ingen endrings historie. Den var sannsynligvis ikke laget "
 "via denne siden"
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django administrasjonsside"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django administrasjon"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Brukernavn:"
@@ -342,27 +447,14 @@ msgstr "Passord:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Har du <a href=\"/password_reset/\">glemt passordet ditt</a>?"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Velkommen"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Endre passord"
-
-#: 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/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Beklager, men siden du spør etter finnest ikke."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -382,6 +474,41 @@ msgstr ""
 msgid "Order:"
 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 ""
+"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/admin/base.html:23
+msgid "Welcome,"
+msgstr "Velkommen"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Endre passord"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Log ut"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -403,18 +530,10 @@ msgstr ""
 msgid "Save"
 msgstr "aktiv"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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:"
+msgid " By %(title)s "
 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
@@ -531,37 +650,86 @@ msgstr "Takk for at du bruker vår side!"
 msgid "The %(site_name)s team"
 msgstr "Hilsen %(site_name)s"
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "handlings tid"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "omadresser fra"
 
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "objekt id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "objekt repr"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "handlings flagg"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "endre melding"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "logg notis"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "logg innlegg"
-
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
+"Denne burde vær en fullstendig sti, uten domene navnet. Foreksempel: '/"
+"nyheter/les/"
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "omadresser til"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Denne kan enten være en fullstendig sti (som over), eller en hel "
+"internettadresse som starter med 'http://'"
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "omadressering"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "omadresserelser"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Eksempel: '/om/kontakt/'. Vær sikker på at du har en skråstrek forran og bak."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "tittel"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "innhold"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "tillat kommentarer"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "mal navn"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Eksempel: 'flatfiler/kontakt_side'. Vist denne ikke denne er gitt, vill "
+"'flatfiles/default' bli brukt."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "registrering kreves"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Vist denne er krysset av er det bare brukere som er logget inn som kan se "
+"siden."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "flatside"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "flatsider"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
@@ -723,87 +891,7 @@ msgstr "innholds type"
 msgid "content types"
 msgstr "innholds typer"
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr "omadresser fra"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Denne burde vær en fullstendig sti, uten domene navnet. Foreksempel: '/"
-"nyheter/les/"
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "omadresser til"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Denne kan enten være en fullstendig sti (som over), eller en hel "
-"internettadresse som starter med 'http://'"
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "omadressering"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "omadresserelser"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Eksempel: '/om/kontakt/'. Vær sikker på at du har en skråstrek forran og bak."
-
-#: models/core.py:89
-msgid "title"
-msgstr "tittel"
-
-#: models/core.py:90
-msgid "content"
-msgstr "innhold"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "tillat kommentarer"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "mal navn"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"Eksempel: 'flatfiler/kontakt_side'. Vist denne ikke denne er gitt, vill "
-"'flatfiles/default' bli brukt."
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "registrering kreves"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Vist denne er krysset av er det bare brukere som er logget inn som kan se "
-"siden."
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "flatside"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "flatsider"
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr "sesjon nøkkel"
 
@@ -911,7 +999,7 @@ msgstr "Personlig informasjon"
 msgid "Important dates"
 msgstr "Viktige datoer"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Meldinger"
 
@@ -919,66 +1007,74 @@ msgstr "Meldinger"
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Tysk"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Engelsk"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Spansk"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Fransk"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galisisk"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Italiensk"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brasiliansk"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Russisk"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Simpel Kinesisk"
 
-#: conf/global_settings.py:49
-msgid "Slovak"
-msgstr ""
-
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Dette feltet må bare inneholde bokstaver, nummer og understreker."
@@ -1247,11 +1343,11 @@ msgstr ""
 "\"%(attr)s\" tillegg på linje $(line)s har en ikke godkjent verdi. (Linja "
 "starter med \"%(start)s\".)"
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Separer Id-ene med kommaer."
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index b1849f19c9..0a4f973221 100644
Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index a4ad0def6d..97f308eb55 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: 2005-10-11 09:12GMT-3\n"
 "Last-Translator: João Paulo Farias <jpaulofarias@gmail.com>\n"
 "Language-Team: Português do Brasil <pt-br@li.org>\n"
@@ -16,111 +16,104 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "habilitar comentários"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
-msgstr ""
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "conteúdo"
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, fuzzy, python-format
-msgid "Select %s to change"
-msgstr "Clique para alterar"
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "Adicionar"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "Modificar"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "Modificar"
-
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "Alterar senha"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "hora da ação"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id do objeto"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr do objeto"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "flag de ação"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "alterar mensagem"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "entrada de log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "entradas de log"
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -148,6 +141,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Clique para alterar"
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Adicionar"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Alterar senha"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -217,7 +318,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -229,18 +330,48 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Site de administração do Django"
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administração do Django"
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
 
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Adicionar"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modificar"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Você não tem permissão para edição."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Ações Recentes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Minhas Ações"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nenhuma disponível"
+
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/logged_out.html:4
 #: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -268,40 +399,6 @@ 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/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Adicionar"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modificar"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Você não tem permissão para edição."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Ações Recentes"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Minhas Ações"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nenhuma disponível"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -331,6 +428,14 @@ msgstr ""
 "Este objeto não tem um histórico de alterações. Ele provavelmente não foi "
 "adicionado por este site de administração."
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Site de administração do Django"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administração do Django"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Usuário:"
@@ -343,28 +448,14 @@ msgstr "Senha:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Você <a href=\"/password_reset/\"esqueceu a senha</a>?"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bem vindo,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Alterar senha"
-
-#: 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/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -384,6 +475,42 @@ msgstr ""
 msgid "Order:"
 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 ""
+"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/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bem vindo,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Alterar senha"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Encerrar sessão"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -405,18 +532,10 @@ msgstr ""
 msgid "Save"
 msgstr "ativar"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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:"
+msgid " By %(title)s "
 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
@@ -532,37 +651,83 @@ msgstr "Obrigado por usar nosso site!"
 msgid "The %(site_name)s team"
 msgstr "Time do %(site_name)s"
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "hora da ação"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "redirecionar de"
 
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id do objeto"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "repr do objeto"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "flag de ação"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "alterar mensagem"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "entrada de log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "entradas de log"
-
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
+"Deve conter um caminho absoluto, excluindo o nome de domínio. Exemplo: '/"
+"eventos/busca/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "redirecionar para"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Deve conter um caminho absoluto (como acima) ou uma URL completa, começando "
+"com 'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "redirecionar"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "redirecionamentos"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "Exemplo: '/sobre/contato/'. Lembre-se das barras no começo e no final."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "título"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "conteúdo"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "habilitar comentários"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "nome do modelo"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Exemplo: 'flatfiles/contact_page'. Se não for informado, será utilizado "
+"'flatfiles/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "é obrigatório registrar"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "Se estiver marcado, apenas usuários conectados poderão ver a página."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "página plana"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "páginas planas"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
@@ -725,84 +890,7 @@ msgstr "tipo de conteúdo"
 msgid "content types"
 msgstr "tipos de conteúdo"
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr "redirecionar de"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Deve conter um caminho absoluto, excluindo o nome de domínio. Exemplo: '/"
-"eventos/busca/'."
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "redirecionar para"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Deve conter um caminho absoluto (como acima) ou uma URL completa, começando "
-"com 'http://'."
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "redirecionar"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "redirecionamentos"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Exemplo: '/sobre/contato/'. Lembre-se das barras no começo e no final."
-
-#: models/core.py:89
-msgid "title"
-msgstr "título"
-
-#: models/core.py:90
-msgid "content"
-msgstr "conteúdo"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "habilitar comentários"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "nome do modelo"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"Exemplo: 'flatfiles/contact_page'. Se não for informado, será utilizado "
-"'flatfiles/default'."
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "é obrigatório registrar"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Se estiver marcado, apenas usuários conectados poderão ver a página."
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "página plana"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "páginas planas"
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr "chave da sessão"
 
@@ -914,7 +1002,7 @@ msgstr "Informações pessoais"
 msgid "Important dates"
 msgstr "Datas importantes"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Mensagem"
 
@@ -922,65 +1010,73 @@ msgstr "Mensagem"
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Tcheco"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Alemão"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Inglês"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Francês"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galiciano"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brazileiro"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Russo"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:52
 #, fuzzy
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: conf/global_settings.py:48
-msgid "Simplified Chinese"
+#: conf/global_settings.py:53
+msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:49
-msgid "Slovak"
+#: conf/global_settings.py:54
+msgid "Simplified Chinese"
 msgstr ""
 
 #: core/validators.py:59
@@ -1247,11 +1343,11 @@ msgstr ""
 "O atributo \"%(attr)s\" na linha %(line)s tem um valor inválido. (Linha "
 "começa com \"%(start)s\".)"
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " Separe IDs múltiplos com vírgulas."
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 013f4e1b96..cd99f24056 100644
Binary files a/django/conf/locale/ro/LC_MESSAGES/django.mo and b/django/conf/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index 4b1b2c4b0b..1ca57b4cb3 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.po
+++ b/django/conf/locale/ro/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-13 20:40+0100\n"
+"POT-Creation-Date: 2005-11-15 13:36+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"
@@ -16,6 +16,73 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "permite comentarii"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "conţinut"
+
+#: contrib/comments/views/comments.py:112
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
+msgstr ""
+
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
+msgstr ""
+
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr ""
+
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "timp acţiune"
@@ -44,8 +111,264 @@ msgstr "intrare log"
 msgid "log entries"
 msgstr "intrări log"
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Login"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Adaugă"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Schimbă"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Schimbă"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Schimbă parola"
+
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "timp acţiune"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Dată/oră"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "Adresa email:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "Decembrie"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "adresa email"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Introduceţi un număr întreg."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+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/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -55,7 +378,28 @@ msgstr "intrări log"
 msgid "Home"
 msgstr "Acasă"
 
+#: 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/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Istoric"
 
@@ -91,59 +435,6 @@ msgstr "Administrare sit Django"
 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:"
@@ -156,21 +447,32 @@ msgstr "Parola:"
 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/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Pagină inexistentă"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bine ai venit,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Schimbă parola"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Deautentificare"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -196,6 +498,44 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Da, sînt sigur"
 
+#: 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/submit_line.html:3
+msgid "Delete"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "activ"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+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
@@ -342,10 +682,6 @@ msgstr "redirectare"
 msgid "redirects"
 msgstr "redictări"
 
-#: contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr "URL"
-
 #: contrib/flatpages/models/flatpages.py:7
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -663,79 +999,79 @@ msgstr "Informaţii personale"
 msgid "Important dates"
 msgstr "Date importante"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Mesaj"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Cehă"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Germană"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Engleză"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Spaniolă"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Franceză"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galiciană"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Italiană"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Norvegiană"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Braziliană"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Rusă"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Sîrbă"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Chineză simplificată"
 
@@ -1007,11 +1343,11 @@ msgstr ""
 "Atributul \"%(attr)s\" din linia %(line)s are o valoare invalidă. ( Linia "
 "începe cu \"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Separă ID-urile multiple cu virgulă."
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 30d7a208ca..11c13027de 100644
Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index c358a71d7f..10d10cdee0 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: 2005-10-05 00:00\n"
 "Last-Translator: Dmitry Sorokin <ds@@dial.com.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,111 +15,103 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr ""
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
+#: contrib/comments/views/comments.py:109
+msgid "count"
 msgstr ""
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, fuzzy, python-format
-msgid "Select %s to change"
-msgstr "�������� ��� ���������"
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "��������"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "��������"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "��������"
-
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "��������� ������"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/admin/models/admin.py:6
+#, fuzzy
+msgid "action time"
+msgstr "����/�����"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr ""
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr ""
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -147,6 +139,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "�������� ��� ���������"
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "��������"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "��������"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "��������"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "��������� ������"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -214,7 +314,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr ""
 
@@ -226,18 +326,48 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "���������������� ���� Django"
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "����������������� Django"
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
 
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "��������"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "��������"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "������������ ���� ��� ��������������."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "��������� ��������"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "��� ��������"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "����������"
+
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/logged_out.html:4
 #: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -265,40 +395,6 @@ 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/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "� ���������, ������������� ���� �������� �� �������."
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "��������"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "��������"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "������������ ���� ��� ��������������."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "��������� ��������"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "��� ��������"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "����������"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -328,6 +424,14 @@ msgstr ""
 "������ ������ �� ����� ������� ���������. �������� �� �� ��� �������� ����� "
 "������ ���������������� ����."
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "���������������� ���� Django"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "����������������� Django"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "���:"
@@ -340,28 +444,14 @@ msgstr "
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "�� <a href=\"/password_reset/\">������ ������</a>?"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "����� ����������,"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "�������� �� �������"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-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/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "� ���������, ������������� ���� �������� �� �������."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -381,6 +471,42 @@ msgstr ""
 msgid "Order:"
 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/admin/base.html:23
+msgid "Welcome,"
+msgstr "����� ����������,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "��������� ������"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "�����"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -401,18 +527,10 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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:"
+msgid " By %(title)s "
 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
@@ -528,37 +646,75 @@ msgstr "
 msgid "The %(site_name)s team"
 msgstr "������� ����� di %(site_name)s"
 
-#: contrib/admin/models/admin.py:6
-#, fuzzy
-msgid "action time"
-msgstr "����/�����"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
 msgstr ""
 
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
 
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
 msgstr ""
 
-#: contrib/admin/models/admin.py:12
-msgid "change message"
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
 msgstr ""
 
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
 msgstr ""
 
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
 msgstr ""
 
 #: utils/translation.py:335
@@ -722,78 +878,7 @@ msgstr ""
 msgid "content types"
 msgstr ""
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr ""
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr ""
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-
-#: models/core.py:73
-msgid "redirect"
-msgstr ""
-
-#: models/core.py:74
-msgid "redirects"
-msgstr ""
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-
-#: models/core.py:89
-msgid "title"
-msgstr ""
-
-#: models/core.py:90
-msgid "content"
-msgstr ""
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr ""
-
-#: models/core.py:92
-msgid "template name"
-msgstr ""
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-
-#: models/core.py:94
-msgid "registration required"
-msgstr ""
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-
-#: models/core.py:98
-msgid "flat page"
-msgstr ""
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr ""
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr ""
 
@@ -903,7 +988,7 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr ""
 
@@ -911,71 +996,71 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -1226,11 +1311,11 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index e836c4def1..5ed2c230d3 100644
Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 32985b0e28..25c64d061a 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Vladimir Labath <vlado@labath.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,111 +16,104 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "povolené komentáre"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
-msgstr ""
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "obsah"
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, python-format
-msgid "Select %s to change"
-msgstr ""
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "Pridaj"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "Zmeň"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "Zmeň"
-
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "Zmena hesla"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "čas udalosti"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "objekt id"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "objekt repr"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "návestie udalosti"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "zmena zprávy"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "záznam priebehu"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "záznamy priebehu"
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -148,6 +141,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Pridaj"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Zmeň"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Zmeň"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Zmena hesla"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -217,7 +318,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -229,57 +330,16 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django web admin"
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administrácia Django"
-
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: 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/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 "Začiatok"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Chyba servera"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Chyba servera (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Chyba servera <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
 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."
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
 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
-#, fuzzy
-msgid "Page not found"
-msgstr ""
-"#-#-#-#-#  django.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Stránka nebola nájdená\n"
-"#-#-#-#-#  django.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Stránka sa nenašla"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená."
 
 #: contrib/admin/templates/admin/index.html:27
 #: contrib/admin/templates/admin/change_form.html:14
@@ -306,6 +366,38 @@ msgstr "Moje udalosti"
 msgid "None available"
 msgstr "Nepovolené"
 
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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 "Začiatok"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Chyba servera"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Chyba servera (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+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/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -335,6 +427,14 @@ msgstr ""
 "Tento object nemá históriu zmien. Možno nebol pridaný prostredníctvom tohoto "
 "web admina"
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django web admin"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administrácia Django"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Meno:"
@@ -347,28 +447,19 @@ msgstr "Heslo:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Zabudli ste<a href=\"/password_reset/\"> vaše heslo</a>?"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Vítajte,"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Zmena hesla"
-
-#: 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:"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+#, fuzzy
+msgid "Page not found"
 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:"
+"#-#-#-#-#  django.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Stránka nebola nájdená\n"
+"#-#-#-#-#  django.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Stránka sa nenašla"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -388,6 +479,42 @@ msgstr ""
 msgid "Order:"
 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 ""
+"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/admin/base.html:23
+msgid "Welcome,"
+msgstr "Vítajte,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Zmena hesla"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odhlásenie"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -409,18 +536,10 @@ msgstr ""
 msgid "Save"
 msgstr "aktívny"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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:"
+msgid " By %(title)s "
 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
@@ -536,37 +655,97 @@ msgstr "Ďakujeme, že používate naše stránky!"
 msgid "The %(site_name)s team"
 msgstr "Skupina %(site_name)s"
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "čas udalosti"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "presmerovaný z"
 
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "objekt id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "objekt repr"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "návestie udalosti"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "zmena zprávy"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "záznam priebehu"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "záznamy priebehu"
-
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
+"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "presmerovaný na "
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Tu môže byť buď absolútna cesta (ako hore) alebo plné  URL začínajúce s "
+"'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "presmerovanie"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "presmerovania"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj "
+"záverečné lomítka."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "názov"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "obsah"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "povolené komentáre"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "meno predlohy"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Príklad: 'flatfiles/contact_page'. Ak sa toto nevykonalo,  systém použije  "
+"'flatfiles/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "musíte byť zaregistrovaný"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "plochá stránka"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "ploché stránky"
+
+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr "DATUM_FORMAT"
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr "DATUMCAS_FORMAT"
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr "CAS_FORMAT"
 
 #: utils/dates.py:6
 msgid "Monday"
@@ -672,18 +851,6 @@ msgstr ""
 msgid "Dec."
 msgstr ""
 
-#: utils/translation.py:335
-msgid "DATE_FORMAT"
-msgstr "DATUM_FORMAT"
-
-#: utils/translation.py:336
-msgid "DATETIME_FORMAT"
-msgstr "DATUMCAS_FORMAT"
-
-#: utils/translation.py:337
-msgid "TIME_FORMAT"
-msgstr "CAS_FORMAT"
-
 #: models/core.py:7
 msgid "domain name"
 msgstr "meno domény"
@@ -728,86 +895,7 @@ msgstr "typ obsahu"
 msgid "content types"
 msgstr "typy obsahu"
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr "presmerovaný z"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'."
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "presmerovaný na "
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Tu môže byť buď absolútna cesta (ako hore) alebo plné  URL začínajúce s "
-"'http://'."
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "presmerovanie"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "presmerovania"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj "
-"záverečné lomítka."
-
-#: models/core.py:89
-msgid "title"
-msgstr "názov"
-
-#: models/core.py:90
-msgid "content"
-msgstr "obsah"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "povolené komentáre"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "meno predlohy"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"Príklad: 'flatfiles/contact_page'. Ak sa toto nevykonalo,  systém použije  "
-"'flatfiles/default'."
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "musíte byť zaregistrovaný"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku."
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "plochá stránka"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "ploché stránky"
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr "kľúč sedenia"
 
@@ -924,66 +1012,74 @@ msgstr "Zpráva"
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Český"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Nemecký"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Anglický"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Španielsky"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Francúzsky"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galicijský"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Taliansky"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Nórsky"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brazílsky"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Ruský"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Srbský"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Zjednodušená činština "
 
-#: conf/global_settings.py:49
-msgid "Slovak"
-msgstr ""
-
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Toto môže obsahovať len písmená, číslice a podčiarkovníky."
@@ -1249,11 +1345,11 @@ msgstr ""
 "Atribút \"%(attr)s\" na riadku %(line)s má neplatnú hodnotu. (Riadok začína "
 "s \"%(start)s\".)"
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Identifikátory oddeľte  čiarkami."
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
@@ -1262,21 +1358,21 @@ msgstr ""
 
 # #-#-#-#-#  django.po (PACKAGE VERSION)  #-#-#-#-#
 # templates/blog/entries_detail.html:24
-#: commit
-msgid "Post a comment"
-msgstr "Pošli komentár"
+#~ msgid "Post a comment"
+#~ msgstr "Pošli komentár"
 
-msgid ""
-"Looks like you followed a bad link. If you think it is our fault, please <a "
-"href=\"http://doma.myvtoronte.com/staznost/\">let us know</a>"
-msgstr ""
-"Pozrite si linku , kde vzikla chyba. Ak si myslíte, že je to naša chyba, <a "
-"href=\"http://doma.myvtoronte.com/staznost/\">dajte nám to vedieť</a>, prosím"
+#~ msgid ""
+#~ "Looks like you followed a bad link. If you think it is our fault, please "
+#~ "<a href=\"http://doma.myvtoronte.com/staznost/\">let us know</a>"
+#~ msgstr ""
+#~ "Pozrite si linku , kde vzikla chyba. Ak si myslíte, že je to naša chyba, "
+#~ "<a href=\"http://doma.myvtoronte.com/staznost/\">dajte nám to vedieť</a>, "
+#~ "prosím"
 
-msgid ""
-"Here is a link to the <a href=\"/\">homepage</a>. You know, just in case"
-msgstr ""
-"Tu je adresa <a href=\"/\">úvodnej stránky</a>. Ak by ste ju potrebovali"
+#~ msgid ""
+#~ "Here is a link to the <a href=\"/\">homepage</a>. You know, just in case"
+#~ msgstr ""
+#~ "Tu je adresa <a href=\"/\">úvodnej stránky</a>. Ak by ste ju potrebovali"
 
 #~ msgid "Comment posted"
 #~ msgstr "Komentár bol poslaný"
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index a97323b95a..6932e25abd 100644
Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index c33507fa16..a49c7c18e0 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Serbian (latin) translation v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 09:05-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: 2005-11-03 00:28+0100\n"
 "Last-Translator: Petar Marić <petar.maric@gmail.com>\n"
 "Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail."
@@ -17,111 +17,104 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: ../../../../\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "omogućite komentare"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
-msgstr ""
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "sadržaj"
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, python-format
-msgid "Select %s to change"
-msgstr ""
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "Dodaj"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "Izmena"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "Izmena"
-
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "Izmeni lozinku"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "Datum/vreme akcije"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id objekta"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "opis objekta"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "akcija"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "opis promene"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "unos u dnevnik izmena"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "unosi u dnevnik izmena"
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -149,6 +142,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Dodaj"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Izmena"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Izmena"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Izmeni lozinku"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -220,7 +321,7 @@ msgstr ""
 
 # nesh: ovo se valjda ne prevodi
 # petar: ne prevodi se
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr ""
 
@@ -232,52 +333,16 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django administracija sajta"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Django administracija"
-
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: 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/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 "Početna strana"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Greška na serveru"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Greška na serveru (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-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."
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
 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/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Tražena strana ne postoji."
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
 
 #: contrib/admin/templates/admin/index.html:27
 #: contrib/admin/templates/admin/change_form.html:14
@@ -304,6 +369,38 @@ msgstr "Moje akcije"
 msgid "None available"
 msgstr "Nema dostupnih"
 
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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 "Početna strana"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Greška na serveru"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Greška na serveru (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+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/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -333,6 +430,14 @@ msgstr ""
 "Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem "
 "administracije sajta."
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django administracija sajta"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django administracija"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Korisničko ime:"
@@ -345,27 +450,14 @@ msgstr "Lozinka:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Da li ste <a href=\"/password_reset/\">zaboravili Vašu lozinku?</a>?"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Dobrodošli,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Izmeni lozinku"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odjavi se"
-
-#: 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 ""
-"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/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Tražena strana ne postoji."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -386,6 +478,41 @@ msgstr ""
 msgid "Order:"
 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 ""
+"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/admin/base.html:23
+msgid "Welcome,"
+msgstr "Dobrodošli,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Izmeni lozinku"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odjavi se"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -407,18 +534,10 @@ msgstr ""
 msgid "Save"
 msgstr "aktivan"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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:"
+msgid " By %(title)s "
 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
@@ -534,37 +653,87 @@ msgstr "Hvala Vam na poseti!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s tim"
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "Datum/vreme akcije"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "redirekcija od"
 
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id objekta"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "opis objekta"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "akcija"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "opis promene"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "unos u dnevnik izmena"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "unosi u dnevnik izmena"
-
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
+"Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/"
+"search/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "redirekcija na"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa "
+"'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "redirekcija"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "redirekcije"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu "
+"crtu."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "naslov"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "sadržaj"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "omogućite komentare"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "ime templejta"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Primer: 'flatfiles/contact-page'. Ako nije dato sistem će koristiti "
+"'flatfiles/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "samo za registrovane korisnike"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj "
+"strani."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "statična strana"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "statične strane"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
@@ -726,88 +895,7 @@ msgstr "tip sadržaja"
 msgid "content types"
 msgstr "tipovi sadržaja"
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr "redirekcija od"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/"
-"search/'."
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "redirekcija na"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa "
-"'http://'."
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "redirekcija"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "redirekcije"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu "
-"crtu."
-
-#: models/core.py:89
-msgid "title"
-msgstr "naslov"
-
-#: models/core.py:90
-msgid "content"
-msgstr "sadržaj"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "omogućite komentare"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "ime templejta"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"Primer: 'flatfiles/contact-page'. Ako nije dato sistem će koristiti "
-"'flatfiles/default'."
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "samo za registrovane korisnike"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj "
-"strani."
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "statična strana"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "statične strane"
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr "ključ sesije"
 
@@ -914,7 +1002,7 @@ msgstr "Lične informacije"
 msgid "Important dates"
 msgstr "Važni datumi"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Poruka"
 
@@ -922,66 +1010,74 @@ msgstr "Poruka"
 msgid "Bengali"
 msgstr "Bengalski"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Češki"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr "Welšski"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Nemački"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Engleski"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Španski"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Francuski"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Italijanski"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brazilski"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Ruski"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Srpski"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Kineski (pojednostavljen)"
 
-#: conf/global_settings.py:49
-msgid "Slovak"
-msgstr ""
-
 # nesh: Ovo je opis za stari SlugField
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
@@ -1250,11 +1346,11 @@ msgstr ""
 "Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje "
 "sa \"%(start)s\".)"
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " Odvojite višestruke ID-ove zarezima."
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index 004c6a00d2..086cd7fa13 100644
Binary files a/django/conf/locale/sv/LC_MESSAGES/django.mo and b/django/conf/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po
index 67c985cad3..8fffbe8c1c 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-13 13:41-0600\n"
+"POT-Creation-Date: 2005-11-15 13:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,73 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "aktivera kommentarer"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "innehåll"
+
+#: contrib/comments/views/comments.py:112
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
+msgstr ""
+
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
+msgstr ""
+
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr ""
+
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "tid för händelse"
@@ -44,8 +111,264 @@ msgstr "loggpost"
 msgid "log entries"
 msgstr "loggpost"
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Logga in"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Lägg till"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Ändra"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Ändra"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Ändra lösenord"
+
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "tid för händelse"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Datum/tid"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "E-postadress:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "december"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "e-postadress"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Fyll i ett heltal."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Lägg till"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Ändra"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Du har inte rättigheter att ändra något."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Senaste händelserna"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mina händelser"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Inga tillgängliga"
+
 #: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -55,7 +378,28 @@ msgstr "loggpost"
 msgid "Home"
 msgstr "Hem"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Serverfel"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Serverfel (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Serverfel <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 ""
+"Ett fel har uppstått. Sidadministratören har meddelats via e-post och felet "
+"bör åtgärdas snart. Tack för ditt tålamod."
+
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Historik"
 
@@ -91,59 +435,6 @@ msgstr "Djangos sidadministration"
 msgid "Django administration"
 msgstr "Administration för Django"
 
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Serverfel"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Serverfel (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Serverfel <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 ""
-"Ett fel har uppstått. Sidadministratören har meddelats via e-post och felet "
-"bör åtgärdas snart. Tack för ditt tålamod."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Sidan kunde inte hittas"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Vi är ledsna, men den efterfrågade sidan kunde inte hittas."
-
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Lägg till"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Ändra"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Du har inte rättigheter att ändra något."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Senaste händelserna"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mina händelser"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Inga tillgängliga"
-
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Användarnamn:"
@@ -156,21 +447,32 @@ msgstr "Lösenord:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Har du <a href=\"/password_reset/\">glömt ditt lösenord</a>?"
 
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Logga in"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Sidan kunde inte hittas"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Välkommen,"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Vi är ledsna, men den efterfrågade sidan kunde inte hittas."
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Ändra lösenord"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Logga ut"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -196,6 +498,44 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ja, jag är säker"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Välkommen,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Ändra lösenord"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Logga ut"
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "aktiv"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+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
@@ -344,10 +684,6 @@ msgstr "vidarebefodra"
 msgid "redirects"
 msgstr "vidarebefodringar"
 
-#: contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr "URL"
-
 #: contrib/flatpages/models/flatpages.py:7
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -664,79 +1000,79 @@ msgstr "Personlig information"
 msgid "Important dates"
 msgstr "Viktiga datum"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "Meddelande"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Bengali"
 msgstr "Bengaliska"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "Tjeckiska"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr "Walesiska"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Tyska"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Engelska"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Spanska"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Franska"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galisiska"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Italienska"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Norska"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brasilianska"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr "Rumänska"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Ryska"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Slovak"
 msgstr "Slovakiska"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Serbiska"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Förenklad kinesiska"
 
@@ -1006,11 +1342,11 @@ msgstr ""
 "Attributet \"%(attr)s\" på rad %(line)s har ett ogiltigt värde. (Raden "
 "börjar med \"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " Separera flera ID:n med kommatecken."
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index c413c1b940..8a46875e16 100644
Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index 0a92c729ee..c004fbb115 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-08 15:05+0000\n"
+"POT-Creation-Date: 2005-11-15 13:35+0100\n"
 "PO-Revision-Date: 2005-11-11 13:55+0800\n"
 "Last-Translator: limodou <limodou@gmail.com>\n"
 "Language-Team: Simplified Chinese <limodou@gmail.com>\n"
@@ -19,111 +19,104 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "允许评论"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:24
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
-#: contrib/admin/views/main.py:187
-#, python-format
-msgid "<h3>By %s:</h3><ul>\n"
-msgstr ""
+#: contrib/comments/views/comments.py:109
+#, fuzzy
+msgid "count"
+msgstr "内容"
 
-#: contrib/admin/views/main.py:210
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:211
-#, python-format
-msgid "Select %s to change"
-msgstr ""
-
-#: contrib/admin/views/main.py:570
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:575 contrib/admin/views/main.py:651
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:583 contrib/admin/views/main.py:660
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:600
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "增加"
-
-#: contrib/admin/views/main.py:616
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:616 contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:618
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "修改"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:623
-msgid "No fields changed."
-msgstr ""
-
-#: contrib/admin/views/main.py:648
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:657
+#: contrib/comments/views/comments.py:112
 #, python-format
 msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:695
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "修改"
-
-#: contrib/admin/views/main.py:775
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/admin/views/main.py:780
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/admin/views/main.py:809
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/admin/views/main.py:812
-msgid "Are you sure?"
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/admin/views/main.py:827
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "修改口令"
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "动作时间"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "对象id"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "对象表示"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "动作标志"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "修改消息"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "日志记录"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "日志记录"
+
+#: contrib/admin/templatetags/admin_list.py:282
+msgid "All dates"
+msgstr ""
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -151,6 +144,114 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "增加"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "修改"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "修改"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "修改口令"
+
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
@@ -220,7 +321,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 models/core.py:87
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr ""
 
@@ -232,52 +333,16 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django管理站点"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Django管理员"
-
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: 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/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 "首页"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "服务器错误"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "服务器错误(500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-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."
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
 msgstr ""
-"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢"
-"谢你的关心。"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "页面没有找到"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "很报歉，请求页面无法找到。"
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
 
 #: contrib/admin/templates/admin/index.html:27
 #: contrib/admin/templates/admin/change_form.html:14
@@ -304,6 +369,38 @@ msgstr "我的动作"
 msgid "None available"
 msgstr "无可用的"
 
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
+#: 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 "首页"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "服务器错误"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "服务器错误(500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+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/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -331,6 +428,14 @@ msgid ""
 "admin site."
 msgstr "此对象没有修改历史。可能不能通过这个管理站点来增加。"
 
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django管理站点"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django管理员"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "用户名："
@@ -343,27 +448,14 @@ msgstr "口令："
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">忘记你的密码</a>？"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "欢迎，"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "页面没有找到"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-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 ""
-"删除 %(object_name)s  '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下"
-"列类型的对象："
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "很报歉，请求页面无法找到。"
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -383,6 +475,40 @@ msgstr ""
 msgid "Order:"
 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 ""
+"删除 %(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/admin/base.html:23
+msgid "Welcome,"
+msgstr "欢迎，"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "修改口令"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "注销"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr ""
@@ -404,17 +530,10 @@ msgstr ""
 msgid "Save"
 msgstr "活动"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/filter.html:1
 #, 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:"
+msgid " By %(title)s "
 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
@@ -529,37 +648,78 @@ msgstr "感谢使用我们的站点！"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s 小组"
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "动作时间"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "重定向自"
 
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "对象id"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr "应该是一个绝对路径，不包括域名。例如：'/events/search/'。"
 
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "对象表示"
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "重定向到"
 
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "动作标志"
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr "可以是绝对路径(同上)或以'http://'开始的全URL。"
 
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "修改消息"
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "重定向"
 
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "日志记录"
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "重定向"
 
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "日志记录"
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "例如：'/about/contact/'。请确保前导和结尾的除号。"
 
-#: contrib/admin/templatetags/admin_list.py:260
-msgid "All dates"
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "标题"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "内容"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "允许评论"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "模板名称"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
 msgstr ""
+"例如：'flatfiles/contact_page'。如果未提供，系统将使用'flatfiles/default'。"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "请先注册"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "如果被选中，仅登录用户才可以查看此页。"
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "简单页面"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "简单页面"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
@@ -721,79 +881,7 @@ msgstr "内容类型"
 msgid "content types"
 msgstr "内容类型"
 
-#: models/core.py:68
-msgid "redirect from"
-msgstr "重定向自"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr "应该是一个绝对路径，不包括域名。例如：'/events/search/'。"
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "重定向到"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr "可以是绝对路径(同上)或以'http://'开始的全URL。"
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "重定向"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "重定向"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "例如：'/about/contact/'。请确保前导和结尾的除号。"
-
-#: models/core.py:89
-msgid "title"
-msgstr "标题"
-
-#: models/core.py:90
-msgid "content"
-msgstr "内容"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "允许评论"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "模板名称"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"例如：'flatfiles/contact_page'。如果未提供，系统将使用'flatfiles/default'。"
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "请先注册"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "如果被选中，仅登录用户才可以查看此页。"
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "简单页面"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "简单页面"
-
-#: models/core.py:117
+#: models/core.py:67
 msgid "session key"
 msgstr "session键字"
 
@@ -900,7 +988,7 @@ msgstr "个人信息"
 msgid "Important dates"
 msgstr "重要日期"
 
-#: models/auth.py:182
+#: models/auth.py:195
 msgid "Message"
 msgstr "消息"
 
@@ -908,66 +996,74 @@ msgstr "消息"
 msgid "Bengali"
 msgstr "孟加拉语"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "Czech"
 msgstr "捷克语"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr "威尔士语"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "德语"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "英语"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "西斑牙语"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "法语"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "加利西亚语"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "意大利语"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "巴西语"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "俄语"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: conf/global_settings.py:49
-msgid "Slovak"
-msgstr ""
-
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "此值只能包含字母、数字和下划线。"
@@ -1218,11 +1314,11 @@ msgid ""
 msgstr ""
 "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " 用逗号分隔多个ID。"
 
-#: core/meta/fields.py:117
+#: core/meta/fields.py:134
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr " 按下 \"Control\"，或者在Mac上按 \"Command\" 来选择一个或多个值。"
diff --git a/django/contrib/comments/templatetags/comments.py b/django/contrib/comments/templatetags/comments.py
index b6f57a652b..bd79d421d4 100644
--- a/django/contrib/comments/templatetags/comments.py
+++ b/django/contrib/comments/templatetags/comments.py
@@ -7,17 +7,18 @@ from django.models.core import contenttypes
 import re
 
 COMMENT_FORM = '''
+{% load i18n %}
 {% if display_form %}
 <form {% if photos_optional or photos_required %}enctype="multipart/form-data" {% endif %}action="/comments/post/" method="post">
 
 {% if user.is_anonymous %}
-<p>Username: <input type="text" name="username" id="id_username" /><br />Password: <input type="password" name="password" id="id_password" /> (<a href="/accounts/password_reset/">Forgotten your password?</a>)</p>
+<p>{% trans "Username:" %} <input type="text" name="username" id="id_username" /><br />{% trans "Password:" %} <input type="password" name="password" id="id_password" /> (<a href="/accounts/password_reset/">{% trans "Forgotten your password?" %}</a>)</p>
 {% else %}
-<p>Username: <strong>{{ user.username }}</strong> (<a href="/accounts/logout/">Log out</a>)</p>
+<p>{% trans "Username:" %} <strong>{{ user.username }}</strong> (<a href="/accounts/logout/">{% trans "Log out" %}</a>)</p>
 {% endif %}
 
 {% if ratings_optional or ratings_required %}
-<p>Ratings ({% if ratings_required %}Required{% else %}Optional{% endif %}):</p>
+<p>{% trans "Ratings" %} ({% if ratings_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):</p>
 <table>
 <tr><th>&nbsp;</th>{% for value in rating_range %}<th>{{ value }}</th>{% endfor %}</tr>
 {% for rating in rating_choices %}
@@ -28,7 +29,7 @@ COMMENT_FORM = '''
 {% endif %}
 
 {% if photos_optional or photos_required %}
-<p>Post a photo ({% if photos_required %}Required{% else %}Optional{% endif %}): <input type="file" name="photo" /></p>
+<p>{% trans "Post a photo" %} ({% if photos_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}): <input type="file" name="photo" /></p>
 <input type="hidden" name="photo_options" value="{{ photo_options }}" />
 {% endif %}
 
@@ -37,7 +38,7 @@ COMMENT_FORM = '''
 <input type="hidden" name="options" value="{{ options }}" />
 <input type="hidden" name="target" value="{{ target }}" />
 <input type="hidden" name="gonzo" value="{{ hash }}" />
-<p><input type="submit" name="preview" value="Preview comment" /></p>
+<p><input type="submit" name="preview" value="{% trans "Preview comment" %}" /></p>
 </form>
 {% endif %}
 '''
@@ -45,12 +46,12 @@ COMMENT_FORM = '''
 FREE_COMMENT_FORM = '''
 {% if display_form %}
 <form action="/comments/postfree/" method="post">
-<p>Your name: <input type="text" id="id_person_name" name="person_name" /></p>
-<p>Comment:<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
+<p>{% trans "Your name:" %} <input type="text" id="id_person_name" name="person_name" /></p>
+<p>{% trans "Comment:" %}<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
 <input type="hidden" name="options" value="{{ options }}" />
 <input type="hidden" name="target" value="{{ target }}" />
 <input type="hidden" name="gonzo" value="{{ hash }}" />
-<p><input type="submit" name="preview" value="Preview comment" /></p>
+<p><input type="submit" name="preview" value="{% trans "Preview comment" %}" /></p>
 </form>
 {% endif %}
 '''
diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py
index 996f3d0328..3eb4a31b71 100644
--- a/django/contrib/comments/views/comments.py
+++ b/django/contrib/comments/views/comments.py
@@ -21,7 +21,7 @@ class PublicCommentManipulator(AuthenticationForm):
         choices = [(c, c) for c in ratings_range]
         def get_validator_list(rating_num):
             if rating_num <= num_rating_choices:
-                return [validators.RequiredIfOtherFieldsGiven(['rating%d' % i for i in range(1, 9) if i != rating_num], "This rating is required because you've entered at least one other rating.")]
+                return [validators.RequiredIfOtherFieldsGiven(['rating%d' % i for i in range(1, 9) if i != rating_num], _("This rating is required because you've entered at least one other rating."))]
             else:
                 return []
         self.fields.extend([
@@ -105,11 +105,11 @@ class PublicCommentManipulator(AuthenticationForm):
         # If the commentor has posted fewer than COMMENTS_FIRST_FEW comments,
         # send the comment to the managers.
         if self.user_cache.get_comments_comment_count() <= COMMENTS_FIRST_FEW:
-            message = 'This comment was posted by a user who has posted fewer than %s comments:\n\n%s' % \
-                (COMMENTS_FIRST_FEW, c.get_as_text())
+            message = _('This comment was posted by a user who has posted fewer than %(count)s comments:\n\n%(text)s' % \
+                {'count': COMMENTS_FIRST_FEW, 'text': c.get_as_text()}
             mail_managers("Comment posted by rookie user", message)
         if COMMENTS_SKETCHY_USERS_GROUP and COMMENTS_SKETCHY_USERS_GROUP in [g.id for g in self.user_cache.get_group_list()]:
-            message = 'This comment was posted by a sketchy user:\n\n%s' % c.get_as_text()
+            message = _('This comment was posted by a sketchy user:\n\n%(text)s') % {'text': c.get_as_text()}
             mail_managers("Comment posted by sketchy user (%s)" % self.user_cache.username, c.get_as_text())
         return c
 
@@ -181,15 +181,15 @@ def post_comment(request):
             choice of ratings
     """
     if not request.POST:
-        raise Http404, "Only POSTs are allowed"
+        raise Http404, _("Only POSTs are allowed")
     try:
         options, target, security_hash = request.POST['options'], request.POST['target'], request.POST['gonzo']
     except KeyError:
-        raise Http404, "One or more of the required fields wasn't submitted"
+        raise Http404, _("One or more of the required fields wasn't submitted")
     photo_options = request.POST.get('photo_options', '')
     rating_options = normalize_newlines(request.POST.get('rating_options', ''))
     if comments.get_security_hash(options, photo_options, rating_options, target) != security_hash:
-        raise Http404, "Somebody tampered with the comment form (security violation)"
+        raise Http404, _("Somebody tampered with the comment form (security violation)")
     # Now we can be assured the data is valid.
     if rating_options:
         rating_range, rating_choices = comments.get_rating_options(base64.decodestring(rating_options))
@@ -199,7 +199,7 @@ def post_comment(request):
     try:
         obj = contenttypes.get_object(pk=content_type_id).get_object_for_this_type(pk=object_id)
     except ObjectDoesNotExist:
-        raise Http404, "The comment form had an invalid 'target' parameter -- the object ID was invalid"
+        raise Http404, _("The comment form had an invalid 'target' parameter -- the object ID was invalid")
     option_list = options.split(',') # options is something like 'pa,ra'
     new_data = request.POST.copy()
     new_data['content_type_id'] = content_type_id
@@ -249,7 +249,7 @@ def post_comment(request):
             comment = manipulator.save(new_data)
         return HttpResponseRedirect("/comments/posted/?c=%s:%s" % (content_type_id, object_id))
     else:
-        raise Http404, "The comment form didn't provide either 'preview' or 'post'"
+        raise Http404, _("The comment form didn't provide either 'preview' or 'post'")
 
 def post_free_comment(request):
     """
@@ -272,19 +272,19 @@ def post_free_comment(request):
             post a comment).
     """
     if not request.POST:
-        raise Http404, "Only POSTs are allowed"
+        raise Http404, _("Only POSTs are allowed")
     try:
         options, target, security_hash = request.POST['options'], request.POST['target'], request.POST['gonzo']
     except KeyError:
-        raise Http404, "One or more of the required fields wasn't submitted"
+        raise Http404, _("One or more of the required fields wasn't submitted")
     if comments.get_security_hash(options, '', '', target) != security_hash:
-        raise Http404, "Somebody tampered with the comment form (security violation)"
+        raise Http404, _("Somebody tampered with the comment form (security violation)")
     content_type_id, object_id = target.split(':') # target is something like '52:5157'
     content_type = contenttypes.get_object(pk=content_type_id)
     try:
         obj = content_type.get_object_for_this_type(pk=object_id)
     except ObjectDoesNotExist:
-        raise Http404, "The comment form had an invalid 'target' parameter -- the object ID was invalid"
+        raise Http404, _("The comment form had an invalid 'target' parameter -- the object ID was invalid")
     option_list = options.split(',')
     new_data = request.POST.copy()
     new_data['content_type_id'] = content_type_id
@@ -313,7 +313,7 @@ def post_free_comment(request):
             comment = manipulator.save(new_data)
         return HttpResponseRedirect("/comments/posted/?c=%s:%s" % (content_type_id, object_id))
     else:
-        raise Http404, "The comment form didn't provide either 'preview' or 'post'"
+        raise Http404, _("The comment form didn't provide either 'preview' or 'post'")
 
 def comment_was_posted(request):
     """
diff --git a/django/contrib/comments/views/karma.py b/django/contrib/comments/views/karma.py
index 2e2b2495ab..9db68d69f1 100644
--- a/django/contrib/comments/views/karma.py
+++ b/django/contrib/comments/views/karma.py
@@ -15,13 +15,13 @@ def vote(request, comment_id, vote):
     if not rating:
         raise Http404, "Invalid vote"
     if request.user.is_anonymous():
-        raise Http404, "Anonymous users cannot vote"
+        raise Http404, _("Anonymous users cannot vote")
     try:
         comment = comments.get_object(pk=comment_id)
     except comments.CommentDoesNotExist:
-        raise Http404, "Invalid comment ID"
+        raise Http404, _("Invalid comment ID")
     if comment.user_id == request.user.id:
-        raise Http404, "No voting for yourself"
+        raise Http404, _("No voting for yourself")
     karma.vote(request.user.id, comment_id, rating)
     # Reload comment to ensure we have up to date karma count
     comment = comments.get_object(pk=comment_id)