diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index 3624f8afe2..f8d4170995 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 632a634f13..ff756466d9 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-23 11:35-0600\n"
+"POT-Creation-Date: 2005-11-23 00:06+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"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "সোমবার"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "নভে."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "কাজের সময়"
@@ -306,6 +352,134 @@ msgstr "কার্যবিবরণী এন্ট্রি"
 msgid "log entries"
 msgstr "কার্যবিবরণী এন্ট্রি সমুহ"
 
+#: contrib/admin/templatetags/admin_list.py:244
+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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "জ্যাঙ্গো পরিচালনা"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "যোগ করুন"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "পরিবর্তন"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "পরিবর্তন"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -382,18 +556,72 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "বাড়ি"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+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
+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 "ইতিহাস"
 
@@ -429,59 +657,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 "ব্যবহারকারীর নাম:"
@@ -494,21 +669,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
@@ -533,6 +719,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
@@ -647,6 +871,66 @@ msgstr "আমাদের স্থান ব্যবহার করার 
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s দল"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "বস্তু আই.ডি."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "রিডাইরেক্ট করা"
@@ -1028,83 +1312,125 @@ msgstr "গুরুত্বপূর্ণ তারিখ"
 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
 #, fuzzy
 msgid "Danish"
 msgstr "স্প্যানিশ"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "জার্মান"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "ইংরেজী"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "স্প্যানিশ"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "ফরাসী"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "গ্যালিসিয়"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "ইতালিয়"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr "নরওয়েজিয়"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "ব্রাজিলীয়"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr "রোমানীয়"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "রুশ"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr "স্লোভাক"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr "সার্বিয়ান"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "সরলীকৃত চীনা"
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "এই ক্ষেত্রেটি অবৈধ।"
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "ছোটহাতের অক্ষর এখানে ঢোকাতে পারবেন না।"
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "একটি গোটা সংখ্যা ঢোকান।"
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "একটি গোটা সংখ্যা ঢোকান।"
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "একটি গোটা সংখ্যা ঢোকান।"
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "এই মানটি শুধু মাত্র অক্ষর, অংক, এবং আন্ডারস্কোর (_) হতে পারবে।"
@@ -1366,16 +1692,40 @@ msgstr ""
 "\"%(attr)s\"বৈশিষ্ট্যয় লাইন %(line)s একটি অবৈধ মান আছে । (\"%(start)s\"এর সঙ্গে "
 "লাইন আরম্ভ।)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "দয়া করে একটি বৈধ IP ঠিকানা ঢোকান।"
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: 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 ""
 "একের চেয়ে বেশি নির্বাচন করতে \"Control\" অথবা ম্যাক-এ \"Command\" চেপে ধরে "
 "রাখুন।"
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "একটি MD5 হ্যাশ ব্যাবহার করুন -- পরিস্কার পাসওয়ার্ড না যেন।"
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "একটি বৈধ ই-মেল ঠিকানা ঢোকান।"
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "count"
+#~ msgstr "অভ্যন্তরস্থ বস্তু"
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index 75ef21d976..42d1fa64cc 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 a745f1e752..c595316209 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Czech translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-23 11:34-0600\n"
-"PO-Revision-Date: 2005-11-14 15:34+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
+"PO-Revision-Date: 2005-11-18 14:33+0100\n"
 "Last-Translator: Radek Svarz <translate@svarz.cz>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 #: contrib/comments/models/comments.py:161
 #, fuzzy
 msgid "object ID"
-msgstr "object id"
+msgstr "Ukázat id objektu"
 
 #: contrib/comments/models/comments.py:9
 msgid "headline"
@@ -82,9 +82,8 @@ msgid "is public"
 msgstr ""
 
 #: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
-#, fuzzy
 msgid "IP address"
-msgstr "e-mailová adresa"
+msgstr "IP adresa"
 
 #: contrib/comments/models/comments.py:27
 msgid "is removed"
@@ -129,7 +128,7 @@ msgstr "křestní jméno"
 #: contrib/comments/models/comments.py:166
 #, fuzzy
 msgid "ip address"
-msgstr "e-mailová adresa"
+msgstr "IP adresa"
 
 #: contrib/comments/models/comments.py:168
 msgid "approved by staff"
@@ -188,12 +187,15 @@ msgid "Flag by %r"
 msgstr ""
 
 #: contrib/comments/models/comments.py:271
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "This comment was flagged by %(user)s:\n"
 "\n"
 "%(text)s"
 msgstr ""
+"Tento komentář byl odevzdán povrchním uživatelem:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/models/comments.py:278
 #, fuzzy
@@ -215,24 +217,25 @@ msgstr ""
 
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
-msgstr ""
+msgstr "Anonymní uživatelé nemohou hlasovat"
 
 #: contrib/comments/views/karma.py:22
-#, fuzzy
 msgid "Invalid comment ID"
-msgstr "povolit komentáře"
+msgstr "Neplatné ID komentáře"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
-msgstr ""
+msgstr "Nelze hlasovat pro sebe"
 
 #: contrib/comments/views/comments.py:25
 msgid ""
 "This rating is required because you've entered at least one other rating."
 msgstr ""
+"Toto hodnocení je povinné, protože jste zadal(a) alespoň jedno jiné "
+"hodnocení."
 
 #: contrib/comments/views/comments.py:109
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "This comment was posted by a user who has posted fewer than %(count)s "
 "comment:\n"
@@ -244,8 +247,20 @@ msgid_plural ""
 "\n"
 "%(text)s"
 msgstr[0] ""
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentářů:\n"
+"\n"
+"%(text)s"
 msgstr[1] ""
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentářů:\n"
+"\n"
+"%(text)s"
 msgstr[2] ""
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentářů:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/views/comments.py:114
 #, python-format
@@ -254,21 +269,24 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
+"Tento komentář byl odevzdán povrchním uživatelem:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/views/comments.py:186
 #: contrib/comments/views/comments.py:277
 msgid "Only POSTs are allowed"
-msgstr ""
+msgstr "Je povolená pouze metoda POST"
 
 #: contrib/comments/views/comments.py:190
 #: contrib/comments/views/comments.py:281
 msgid "One or more of the required fields wasn't submitted"
-msgstr ""
+msgstr "Jedno nebo více povinných polí nebylo vyplněné"
 
 #: contrib/comments/views/comments.py:194
 #: contrib/comments/views/comments.py:283
 msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
+msgstr "Někdo falšoval formulář komentáře (bezpečnostní narušení)"
 
 #: contrib/comments/views/comments.py:204
 #: contrib/comments/views/comments.py:289
@@ -276,11 +294,61 @@ msgid ""
 "The comment form had an invalid 'target' parameter -- the object ID was "
 "invalid"
 msgstr ""
+"Formulář komentáře měl neplatný parametr 'target' -- ID objektu nebylo platné"
 
 #: contrib/comments/views/comments.py:254
 #: contrib/comments/views/comments.py:318
 msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "Formulář komentáře neobsahoval buď 'preview' nebo 'post'"
+
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
 msgstr ""
+"<h3>Od %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr "Vše"
+
+#: contrib/admin/filterspecs.py:100
+#, fuzzy
+msgid "Any date"
+msgstr "Všechna data"
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Pondělí"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "List."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr "Neznámé"
 
 #: contrib/admin/models/admin.py:6
 msgid "action time"
@@ -310,69 +378,198 @@ msgstr "log záznam"
 msgid "log entries"
 msgstr "log záznamy"
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr "Všechna data"
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Přihlášení"
+
+#: 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 ""
+"Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše "
+"podání je uloženo."
+
+#: 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 ""
+"Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, "
+"zapněte cookies, obnovte tuto stránku a zkuste znovu."
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr "Uživatelská jména nemohou obsahovat znak '@'."
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+"Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho '%s'."
+
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Django správa"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr "Vybrat %s"
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr "Vyberte %s pro změnu"
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně přidán."
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr "Můžete to opět upravit níže."
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr "Můžete přidat další %s níže."
+
+#: contrib/admin/views/main.py:451
+#, python-format
+msgid "Add %s"
+msgstr "%s: přidat"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr "Záznam %s byl přidán."
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr "a"
+
+#: contrib/admin/views/main.py:469
+#, python-format
+msgid "Changed %s."
+msgstr "%s: změněno"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr "Záznam %s byl smazán."
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr "Nebyly změněny žádné pole."
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" byl úspěšně změněn."
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"The %(name)s \"%(obj)s\" byl úspěšně přidán. Můžete to opět upravit níže."
+
+#: contrib/admin/views/main.py:546
+#, python-format
+msgid "Change %s"
+msgstr "%s: změnit"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Jedno nebo více %(fieldname)s z %(name)s: %(obj)s"
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Jedno nebo více %(fieldname)s z %(name)s:"
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně smazán."
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr "Jste si jist(á)?"
+
+#: contrib/admin/views/main.py:678
+#, python-format
+msgid "Change history: %s"
+msgstr "Historie změn: %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
 msgid "Integer"
-msgstr ""
+msgstr "Celé číslo"
 
 #: contrib/admin/views/doc.py:263
 msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Boolean (buď Ano (True), nebo Ne (False))"
 
 #: contrib/admin/views/doc.py:264
 #, python-format
 msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr "Text (maximálně %(maxlength)s znaků)"
 
 #: contrib/admin/views/doc.py:265
 msgid "Comma-separated integers"
-msgstr ""
+msgstr "Celá čísla oddělená čárkou"
 
 #: contrib/admin/views/doc.py:266
-#, fuzzy
 msgid "Date (without time)"
-msgstr "čas akce"
+msgstr "Datum (bez času)"
 
 #: contrib/admin/views/doc.py:267
-#, fuzzy
 msgid "Date (with time)"
-msgstr "Datum/čas"
+msgstr "Datum (s časem)"
 
 #: contrib/admin/views/doc.py:268
-#, fuzzy
 msgid "E-mail address"
-msgstr "E-mailová adresa:"
+msgstr "E-mailová adresa"
 
 #: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
 msgid "File path"
-msgstr ""
+msgstr "Cesta k souboru"
 
 #: contrib/admin/views/doc.py:270
-#, fuzzy
 msgid "Decimal number"
-msgstr "Prosinec"
+msgstr "Desetiné číslo"
 
 #: contrib/admin/views/doc.py:276
 msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Boolean (buď Ano (True), Ne (False), nebo Nic (None))"
 
 #: contrib/admin/views/doc.py:277
-#, fuzzy
 msgid "Phone number"
-msgstr "Vložte celé číslo."
+msgstr "Telefonní číslo"
 
 #: contrib/admin/views/doc.py:280
 msgid "String (up to 50)"
-msgstr ""
+msgstr "Text (max. 50 znaků)"
 
 #: contrib/admin/views/doc.py:282
 msgid "Text"
-msgstr ""
+msgstr "Text"
 
 #: contrib/admin/views/doc.py:283
 msgid "Time"
-msgstr ""
+msgstr "Čas"
 
 #: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
@@ -380,24 +577,78 @@ msgstr "URL"
 
 #: contrib/admin/views/doc.py:285
 msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr "Stát US (2 velké znaky)"
 
 #: contrib/admin/views/doc.py:286
 msgid "XML text"
-msgstr ""
+msgstr "text XML"
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Domů"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "%(name)s: přidat"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Přidat"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Změnit"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nemáte oprávnění nic měnit."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Poslední akce"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mé akce"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nic"
+
+#: 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"
 msgstr "Historie"
 
@@ -433,59 +684,6 @@ msgstr "Django správa webu"
 msgid "Django administration"
 msgstr "Django správa"
 
-#: 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/index.html:27
-msgid "Add"
-msgstr "Přidat"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Změnit"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Nemáte oprávnění nic měnit."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Poslední akce"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mé akce"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nic"
-
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Uživatelské jméno:"
@@ -498,24 +696,36 @@ 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/login.html:24
-msgid "Log in"
-msgstr "Přihlášení"
+#: 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 "Welcome,"
-msgstr "Vítejte,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Změnit heslo"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Pohled na stránku"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odhlásit se"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Prosíme, odstraňte chybu uvedenou níže."
+msgstr[1] "Prosíme, odstraňte chyby uvedené níže."
+msgstr[2] "Prosíme, odstraňte chyby uvedené níže."
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Objednávání"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Objednávka:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
-#, fuzzy, python-format
+#, 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 "
@@ -537,6 +747,43 @@ msgstr ""
 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 "Smazat"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Uložit jako nové"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Uložit a přidat další"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Uložit a pokračovat v úpravách"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Uložit"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr "Od %(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
@@ -651,6 +898,80 @@ msgstr "Děkujeme za používání našeho webu!"
 msgid "The %(site_name)s team"
 msgstr "Tým %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "Dokumentace"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Bookmarklety"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "Dokumentační bookmarklety"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Pro nainstalování bookmarkletů, přetáhněte odkaz na Vaše "
+"záložky (oblíbené),\n"
+"nebo klikněte pravým tlačítkem na odkaz a přidejte ho k Vašim záložkám "
+"(oblíbeným). Nyní můžete\n"
+"zvolit bookmarklet z libovolné stránky. Poznámka: Některé tyto\n"
+"bookmarklety vyžadují, abyste prohlížel(a) stránky z počítače, který je "
+"nastaven jako\n"
+"\"interní\" (promluvte si s Vaším administrátorem, jestli si nejste jisti,\n"
+"zda je Váš počítač \"interní\").</p>\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Dokumentace pro tuto stránku"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Z libovolné stránky otevře dokumentaci pro pohled, který vygeneroval tuto "
+"stránku."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "Ukázat id objektu"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+#, fuzzy
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Ukáže content-type a unikátní ID pro stránky, které reprezentují jeden "
+"objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "Upravit tento objekt (ve stávajícím okně)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "Přepne do admin stránky pro stránky, které reprezentují jeden objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "Upravit tento objekt (ve novém okně)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr "Jako výše, ale otevře admin stránky v novém okně."
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "přesměrovat z"
@@ -705,7 +1026,6 @@ 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'."
@@ -993,9 +1313,8 @@ msgid "Use '[algo]$[salt]$[hexdigest]"
 msgstr ""
 
 #: models/auth.py:38
-#, fuzzy
 msgid "staff status"
-msgstr "povolí přístup do administrativní aplikace"
+msgstr "administrativní přístup "
 
 #: models/auth.py:38
 msgid "Designates whether the user can log into this admin site."
@@ -1041,83 +1360,120 @@ msgstr "Důležitá data"
 msgid "Message"
 msgstr "Zpráva"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 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
-#, fuzzy
-msgid "Danish"
-msgstr "Španělsky"
-
 #: conf/global_settings.py:40
+msgid "Danish"
+msgstr "Dánsky"
+
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Německy"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Anglicky"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Španělsky"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Francouzsky"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "Galicijsky"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr "Islandština"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "Italsky"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr "Norsky"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Brazilsky"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr "Rumunsky"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Rusky"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr "Slovensky"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr "Srbsky"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr "Švédsky"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "Jednoduchá čínština"
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+msgid "This field is required."
+msgstr "Toto pole je povinné."
+
+#: core/formfields.py:339
+#, fuzzy, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Ujistěte se, že Váš text má méně, než %s znaků."
+msgstr[1] "Ujistěte se, že Váš text má méně, než %s znaků."
+msgstr[2] "Ujistěte se, že Váš text má méně, než %s znaků."
+
+#: core/formfields.py:344
+msgid "Line breaks are not allowed here."
+msgstr "Zalomení řádky zde nenjsou povolená."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Vyberte platnou volbu. '%(data)s' není mezi %(choices)s."
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr "Odevzdaný soubor je prázdný."
+
+#: core/formfields.py:659
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Vložte celé číslo mezi -32,768 a 32,767."
+
+#: core/formfields.py:668
+msgid "Enter a positive number."
+msgstr "Vložte celé kladné číslo."
+
+#: core/formfields.py:677
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Vložte celé číslo mezi 0 a 32,767."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Tato hodnota musí obsahovat pouze znaky, čísla nebo podtržítka."
@@ -1388,16 +1744,52 @@ msgstr ""
 "Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s "
 "\"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Prosíme, zadejte %s správně."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "%(optname)s s tímto %(fieldname)s již existuje."
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Oddělte více identifikátorů čárkami."
 
-#: 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 ""
 "Podržte  \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné "
 "položky."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Použije se MD5 hash -- ne čisté heslo."
+#: core/meta/fields.py:511
+msgid "Enter a valid filename."
+msgstr "Vložte platný název souboru."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] "Prosíme, vložte platná %(self)s ID. Hodnota %(value)r není platná."
+msgstr[1] ""
+"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
+msgstr[2] ""
+"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
+
+#~ msgid "Error in Template"
+#~ msgstr "Chyba v šabloně"
+
+#~ msgid ""
+#~ "\n"
+#~ "In template %(name)s, error at line %(line)s:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "V šabloně %(name)s, chyba na řádce %(line)s:\n"
+
+#, fuzzy
+#~ msgid "count"
+#~ msgstr "počet"
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index da157858a8..99232e2071 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 9e4d5afc55..1f0c98b412 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-23 11:35-0600\n"
+"POT-Creation-Date: 2005-11-23 00:06+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"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Dydd Llun"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Tach."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "amser gweithred"
@@ -306,6 +352,134 @@ msgstr "cofnod"
 msgid "log entries"
 msgstr "cofnodion"
 
+#: contrib/admin/templatetags/admin_list.py:244
+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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Gweinyddiad Django"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Ychwanegu"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Newidio"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Newidio"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -382,18 +556,72 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Adref"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Ychwanegu"
+
+#: 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
+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"
 
@@ -429,59 +657,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:"
@@ -494,21 +669,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
@@ -533,6 +719,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
@@ -645,6 +869,66 @@ msgstr "Diolch am ddefnyddio ein safle!"
 msgid "The %(site_name)s team"
 msgstr "Y tîm %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "id gwrthrych"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "ailgyfeirio o"
@@ -1031,83 +1315,125 @@ msgstr "Dyddiadau pwysig"
 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
 #, fuzzy
 msgid "Danish"
 msgstr "Spaeneg"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Almaeneg"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Saesneg"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Spaeneg"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Ffrangeg"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "Galisieg"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "Eidaleg"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr "Norwyeg"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Brasileg"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Rwsieg"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr "Serbeg"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "Tsieinëeg Symledig"
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "Mae'r faes yma yn annilydd."
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "Ni chaniateir lythrennau bach yma."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Rhowch rhif cyfan."
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Rhowch rhif cyfan."
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Rhowch rhif cyfan."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Rhaid i'r werth yma cynnwys lythrennau, rhifau ac tanlinellau yn unig."
@@ -1375,15 +1701,39 @@ 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:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Rhowch cyfeiriad IP dilys, os gwelwch yn dda."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: 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 ""
 "Gafaelwch lawr \"Control\", neu \"Command\" ar Fac, i ddewis mwy nag un."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Defnyddiwch stwnsh MD5 -- nid y gyfrinair crai."
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Rhowch cyfeiriad e-bost ddilys."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "count"
+#~ msgstr "cynnwys"
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 8fe7ba3886..222fa4af32 100644
Binary files a/django/conf/locale/da/LC_MESSAGES/django.mo and b/django/conf/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po
index 9e1e8d49e5..1e3b779873 100644
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/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-23 11:35-0600\n"
+"POT-Creation-Date: 2005-11-23 00:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Morten Bagai <m@bagai.com>\n"
 "Language-Team: Danish\n"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Mandag"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "handlingstid"
@@ -306,6 +352,134 @@ msgstr "logmeddelelse"
 msgid "log entries"
 msgstr "logmeddelelser"
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Log ind"
+
+#: 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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Django administration"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Tilføj"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Ændre"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Ændre"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Ændre adgangskode"
+
 #: 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
@@ -382,18 +556,72 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Hjem"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Tilføj"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Ændre"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Du har ikke rettigehed til at foretage ændringer"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Seneste handlinger"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mine handlinger"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ingen tilgængelige"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Serverfejl"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Serverfejl (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Serverfejl <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 ""
+"Der opstod en fejl. Fejlen er rapporteret til site-administratoren via e-"
+"mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed."
+
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Historik"
 
@@ -429,59 +657,6 @@ msgstr "Django site administration"
 msgid "Django administration"
 msgstr "Django administration"
 
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Serverfejl"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Serverfejl (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Serverfejl <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 ""
-"Der opstod en fejl. Fejlen er rapporteret til site-administratoren via e-"
-"mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Siden blev ikke fundet"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Vi Beklager, men den ønskede side kunne ikke findes"
-
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Tilføj"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Ændre"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Du har ikke rettigehed til at foretage ændringer"
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Seneste handlinger"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mine handlinger"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ingen tilgængelige"
-
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Brugernavn:"
@@ -494,21 +669,32 @@ msgstr "Adgangskode:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Har du <a href=\"/password_reset/\">glemt din adgangskode</a>?"
 
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Log ind"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Siden blev ikke fundet"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Velkommen"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Vi Beklager, men den ønskede side kunne ikke findes"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Ændre adgangskode"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Log ud"
+#: 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
@@ -533,6 +719,44 @@ msgstr ""
 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 "Ændre adgangskode"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Log ud"
+
+#: 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
@@ -649,6 +873,66 @@ msgstr "Tak, fordi du brugte vores site!"
 msgid "The %(site_name)s team"
 msgstr "Med venlig hilsen %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "objekt id"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "omadresser fra"
@@ -1035,83 +1319,125 @@ msgstr "Vigtige datoer"
 msgid "Message"
 msgstr "Meddelelse"
 
-#: 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 "Tjekkisk"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr "Walisisk"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 #, fuzzy
 msgid "Danish"
 msgstr "Spansk"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Tysk"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Engelsk"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Spansk"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Fransk"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "Galicisk"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "Italiensk"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Brasiliansk"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr "Rumænsk"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Russisk"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr "Svensk"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "Simpel Kinesisk"
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "Dette felt er ugyldigt."
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "Små bogstaver er ikke tilladt her"
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Indtast et heltal."
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Indtast et heltal."
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Indtast et heltal."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Dette felt må kun indeholde bogstaver, tal og understreger."
@@ -1375,18 +1701,38 @@ msgstr ""
 "\"%(attr)s\" attributten på linje $(line)s har en ugyldig værdi. (Linjen "
 "starter med \"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Venlist indtast en gyldig email-adresse."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Adskil id'er med kommaer."
 
-#: 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 ""
 "Hold \"Kontrol\", eller \"Æbletasten\" på Mac, nede for at vælge mere end en."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Brug et MD5 hash -- ikke adgangskoden i klartekst"
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Indtast en gyldig email-adresse."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
 
 #~ msgid "Traditional Chinese"
 #~ msgstr "Traditionel Kinesisk"
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 4cfc409cb1..72ba0c03ed 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 65428ab2f7..98e308c815 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -7,10 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-24 19:33+0100\n"
-"PO-Revision-Date: 2005-11-06 13:54+0100\n"
-"Last-Translator: Lukas Kolbe <lucky@knup.de>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2005-11-23 16:48+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"
@@ -77,7 +76,7 @@ msgstr "ist 
 
 #: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
 msgid "IP address"
-msgstr "IP Adresse"
+msgstr "IP-Adresse"
 
 #: contrib/comments/models/comments.py:27
 msgid "is removed"
@@ -115,7 +114,7 @@ msgid ""
 msgstr ""
 "Geschrieben von %(user)s am %(date)s\n"
 "\n"
-"$(comment)s\n"
+"%(comment)s\n"
 "\n"
 "http://%(domain)s%(url)s"
 
@@ -289,6 +288,52 @@ msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt"
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Nach %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr "Alle"
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr "Alle Daten"
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr "Heute"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr "Letzte 7 Tage"
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr "Diesen Monat"
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr "Dieses Jahr"
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr "Ja"
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr "Nein"
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr "Unbekannt"
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "Zeit der Aktion"
@@ -317,6 +362,141 @@ msgstr "Logeintrag"
 msgid "log entries"
 msgstr "Logeintr�ge"
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr "Alle Tage"
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Anmelden"
+
+#: 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 ""
+"Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst: die "
+"Beitr�ge wurden gesichert."
+
+#: 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 ""
+"Es sieht danach aus, das der Browser keine Cookies akzeptiert. Bitte im "
+"Browser Cookies aktivieren und diese Seite neu laden."
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr "Benutzernamen k�nnen das Zeichen '@' nicht enthalten."
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+"Die eMail-Adresse ist nicht der Benutzername. Bitte '%s' stattdessen "
+"versuchen."
+
+#: contrib/admin/views/main.py:50
+msgid "Site administration"
+msgstr "Website Verwaltung"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr "%s ausw�hlen"
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr "%s zur �nderung ausw�hlen"
+
+#: contrib/admin/views/main.py:421
+#, 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:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr "Das Element kann jetzt weiter ge�ndert werden."
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, 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:451
+#, python-format
+msgid "Add %s"
+msgstr "%s zuf�gen"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr "%s hinzugef�gt."
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr "und"
+
+#: contrib/admin/views/main.py:469
+#, python-format
+msgid "Changed %s."
+msgstr "%s ge�ndert"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr "%s gel�scht."
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr "Keine Felder ge�ndert."
+
+#: contrib/admin/views/main.py:499
+#, 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:508
+#, 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:546
+#, python-format
+msgid "Change %s"
+msgstr "%s �ndern"
+
+#: contrib/admin/views/main.py:626
+#, 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:631
+#, 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:660
+#, 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:663
+msgid "Are you sure?"
+msgstr "Sicher? Ganz sicher?"
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -388,18 +568,73 @@ msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)"
 msgid "XML text"
 msgstr "XML Text"
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Start"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "%(name)s zuf�gen"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Zuf�gen"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "�ndern"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Sie haben keine Berechtigung irgendwas zu �ndern."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "K�rzliche Aktionen"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Meine Aktionen"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Keine vorhanden"
+
+#: 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"
 msgstr "Geschichte"
 
@@ -435,26 +670,17 @@ msgstr "Django Systemverwaltung"
 msgid "Django administration"
 msgstr "Django Verwaltung"
 
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Serverfehler"
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Benutzername:"
 
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Serverfehler (500)"
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Passwort:"
 
-#: 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/login.html:20
+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/404.html:4
 #: contrib/admin/templates/admin/404.html:8
@@ -466,57 +692,23 @@ 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/index.html:27
-msgid "Add"
-msgstr "Hinzuf�gen"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Im Web Anzeigen"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "�ndern"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Bitte den Fehler korrigieren."
+msgstr[1] "Bitte die Fehler korrigieren."
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Sie haben keine Berechtigung irgendetwas zu �ndern."
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Sortierung"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "K�rzliche Aktionen"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Meine Aktionen"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Keine vorhanden"
-
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Kennwort:"
-
-#: contrib/admin/templates/admin/login.html:20
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "Haben Sie <a href=\"/password_reset/\">ihr Kennwort vergessen</a>?"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Anmelden"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Willkommen,"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Kennwort �ndern"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Abmelden"
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Reihenfolge:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -542,6 +734,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
@@ -570,9 +799,8 @@ 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 ""
-"Sie haben Ihr Kennwort vergessen? Geben Sie bitte Ihre eMail-Adresse ein und "
-"wir setzen das Kennwort auf einen neuen Wert und schicken den per eMail an "
-"Sie raus."
+"Passwort vergessen? Einfach die E-Mail-Adresse eingeben und wir setzen das "
+"Passwort auf ein neues und senden das per E-Mail zu."
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -593,7 +821,7 @@ msgstr "Erneut Anmelden"
 #: contrib/admin/templates/registration/password_reset_done.html:6
 #: contrib/admin/templates/registration/password_reset_done.html:10
 msgid "Password reset successful"
-msgstr "Kennwort erfolgreich zur�ckgesetzt"
+msgstr "Erfolgreich Kennwort zur�ckgesetzt"
 
 #: contrib/admin/templates/registration/password_reset_done.html:12
 msgid ""
@@ -659,6 +887,81 @@ msgstr "Vielen Dank, das Sie unsere Seiten benutzen!"
 msgid "The %(site_name)s team"
 msgstr "Das Team von %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "Dokumentations-Bookmarklets"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Um Bookmarklets zu installieren m�ssen diese Links in die\n"
+"Browser-Werkzeugleiste gehzogen werden, oder mittels rechter Maustaste in "
+"die\n"
+"Bookmarks gespeichert werden. Danach k�nnen die Bookmarklets von jeder "
+"Seite\n"
+"aufgerufen werden. Einige Bookmarklets sind f�r den Zugriff von 'internen'\n"
+"Rechnern eingeschr�nkt. Falls nicht klar ist, ob ein Rechner als 'intern'\n"
+"bewertet wird, bitte den Administrator fragen.</p>\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Dokumentation f�r diese Seite"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Springt von jeder Seite zu der Dokumentation f�r den View der diese Seite "
+"erzeugt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "Objekt ID anzeigen"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Zeigt den Content-Type und die eindeutige ID f�r Seiten die ein einzelnes "
+"Objekt repr�sentieren."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "Dieses Objekt im aktuellen Fenster �ndern."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+"Springt zu der Administrationsseite f�r dieses Objekt, wenn diese Seite ein "
+"Objekt repr�sentiert."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "Dieses Objekt in einem neuen Fenster �ndern."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+"Wie zuvor, aber �ffnent die Administrationsseite in einem neuen Fenster."
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "Umleitung von"
@@ -1117,6 +1420,44 @@ msgstr "Schwedisch"
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+msgid "This field is required."
+msgstr "Dieses Feld ist zwingend."
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Bitte sicherstellen, das der Text weniger als %s Zeichen hat."
+msgstr[1] "Bitte sicherstellen, das der Text weniger als %s Zeichen hat."
+
+#: core/formfields.py:344
+msgid "Line breaks are not allowed here."
+msgstr "Zeilenumbr�che sind hier nicht erlaubt."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+"Bitte eine g�ltige Auswahl treffen; '%(data)s' ist nicht in %(choices)s."
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr "Die ausgew�hlte Datei ist leer."
+
+#: core/formfields.py:659
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Bitte eine ganze Zahl zwischen -32.768 und 32.767 eingeben."
+
+#: core/formfields.py:668
+msgid "Enter a positive number."
+msgstr "Bitte eine ganze, positive Zahl eingeben."
+
+#: core/formfields.py:677
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
@@ -1390,13 +1731,47 @@ msgstr ""
 "Das Attribut %(attr)s in Zeile %(line)s hat einen ung�ltigen Wert. Die Zeile "
 "beginnt mit \"%(start)s\"."
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Bitte ein g�ltiges '%s' eingeben."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "Ein '%(optname)s' mit diesem '%(fieldname)s' existiert bereits."
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Mehrere IDs k�nnen mit Komma getrennt werden."
 
-#: 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 ""
 " Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command"
 "\", beim Klicken gedr�ckt halten."
+
+#: core/meta/fields.py:511
+msgid "Enter a valid filename."
+msgstr "Bitte einen g�ltigen Dateinamen eingeben"
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+"Bitte g�ltige IDs f�r %(self)s eingeben. Der Wert %(value)r ist ung�ltig."
+msgstr[1] ""
+"Bitte g�ltige IDs f�r %(self)s eingeben. Die Werte %(value)r sind ung�ltig."
+
+#~ msgid "Error in Template"
+#~ msgstr "Fehler in der Vorlage"
+
+#~ msgid ""
+#~ "\n"
+#~ "In template %(name)s, error at line %(line)s:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fehler in der Vorlage %(name)s, in Zeile %(line)s:\n"
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index 6ee4ac7071..7199e536de 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 ab11f413ed..3ba0920f30 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-23 11:34-0600\n"
+"POT-Creation-Date: 2005-11-23 00:05+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"
@@ -263,6 +263,50 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr ""
@@ -291,6 +335,133 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
+#: contrib/admin/templatetags/admin_list.py:244
+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:50
+msgid "Site administration"
+msgstr ""
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, python-format
+msgid "Changed %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, python-format
+msgid "Change %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -362,18 +533,70 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr ""
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+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
+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"
 msgstr ""
 
@@ -407,57 +630,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 ""
-
-#: 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 ""
@@ -470,20 +642,31 @@ msgstr ""
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr ""
 
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
+#: 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,"
+#: 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"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
+#: 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
@@ -505,6 +688,43 @@ 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
+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
@@ -613,6 +833,65 @@ msgstr ""
 msgid "The %(site_name)s team"
 msgstr ""
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr ""
@@ -984,82 +1263,119 @@ msgstr ""
 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 "Danish"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr ""
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+msgid "This field is required."
+msgstr ""
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+msgid "Line breaks are not allowed here."
+msgstr ""
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr ""
+
+#: core/formfields.py:668
+msgid "Enter a positive number."
+msgstr ""
+
+#: core/formfields.py:677
+msgid "Enter a whole number between 0 and 32,767."
+msgstr ""
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr ""
@@ -1305,11 +1621,33 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr ""
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: 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 ""
+
+#: core/meta/fields.py:511
+msgid "Enter a valid filename."
+msgstr ""
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 1bfc596342..a3613a1dcb 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 d2a7cb0c4b..6794ab5e12 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-23 11:34-0600\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-10-04 20:59GMT\n"
 "Last-Translator: Ricardo Javier C�rdenes Medina <ricardo.cardenes@gmail."
 "com>\n"
@@ -268,6 +268,50 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 #, fuzzy
 msgid "action time"
@@ -297,6 +341,134 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Registrarse"
+
+#: 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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administraci�n de Django"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Cambie para modificar"
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Agregar"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -371,18 +543,74 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Inicio"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Agregar"
+
+#: 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
+#, fuzzy
+msgid "Server error"
+msgstr "Error del servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Error del servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Error de servidor <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Ha ocurrido un error. Se ha informado a los administradores del sitio "
+"mediante correo electr�nico y deber�a arreglarse en breve. Gracias por su "
+"paciencia"
+
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Hist�rico"
 
@@ -418,61 +646,6 @@ msgstr "Sitio de administraci
 msgid "Django administration"
 msgstr "Administraci�n de Django"
 
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "Error del servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Error del servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Error de servidor <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Ha ocurrido un error. Se ha informado a los administradores del sitio "
-"mediante correo electr�nico y deber�a arreglarse en breve. Gracias por su "
-"paciencia"
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "P�gina no encontrada"
-
-#: contrib/admin/templates/admin/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
-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/login.html:15
 msgid "Username:"
 msgstr "Usuario:"
@@ -485,21 +658,32 @@ 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/login.html:24
-msgid "Log in"
-msgstr "Registrarse"
+#: 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 "Welcome,"
-msgstr "Bienvenido,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Cambiar clave"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Terminar"
+#: 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
 #, fuzzy, python-format
@@ -525,6 +709,43 @@ msgstr ""
 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 ""
+
+#: 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
+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
@@ -639,6 +860,65 @@ msgstr "
 msgid "The %(site_name)s team"
 msgstr "El equipo de %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr ""
@@ -1015,82 +1295,120 @@ msgstr ""
 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 "Danish"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr ""
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+msgid "This field is required."
+msgstr ""
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+msgid "Line breaks are not allowed here."
+msgstr ""
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr ""
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Direcci�n de correo:"
+
+#: core/formfields.py:677
+msgid "Enter a whole number between 0 and 32,767."
+msgstr ""
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Este valor debe contener s�lo letras, n�meros y gui�n bajo."
@@ -1338,17 +1656,37 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr ""
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: 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 ""
 
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Direcci�n de correo:"
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
+
 #~ msgid "Server error <em>(500)</em>"
 #~ msgstr "Error del servidor <em>(500)</em>"
-
-#~ msgid "Click to change"
-#~ msgstr "Cambie para modificar"
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index fc0e552bb7..0cec8eb688 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 5988eaaf23..bd32c96654 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-23 11:34-0600\n"
+"POT-Creation-Date: 2005-11-23 00:05+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"
@@ -277,6 +277,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Lundi"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "heure de l'action"
@@ -305,6 +351,134 @@ msgstr "entr
 msgid "log entries"
 msgstr "entr�es de log"
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Connectez vous"
+
+#: 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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administration de Django"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Ajouter"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modifier"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modifier"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -381,18 +555,74 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Accueil"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Ajouter"
+
+#: 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
+#, fuzzy
+msgid "Server error"
+msgstr "Erreur du serveur (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Erreur du serveur (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Erreur du serveur <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Une erreur est survenue. Elle a �t� transmise par courriel aux "
+"administrateurs du site et sera corrig�e dans les meilleurs d�lais. Merci "
+"pour votre patience."
+
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Historique"
 
@@ -428,61 +658,6 @@ msgstr "Site d'administration de Django"
 msgid "Django administration"
 msgstr "Administration de Django"
 
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "Erreur du serveur (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Erreur du serveur (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Erreur du serveur <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Une erreur est survenue. Elle a �t� transmise par courriel aux "
-"administrateurs du site et sera corrig�e dans les meilleurs d�lais. Merci "
-"pour votre patience."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Cette page n'a pas �t� trouv�e"
-
-#: contrib/admin/templates/admin/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
-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/login.html:15
 msgid "Username:"
 msgstr "Nom d'utilisateur"
@@ -495,21 +670,32 @@ 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/login.html:24
-msgid "Log in"
-msgstr "Connectez vous"
+#: 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 "Welcome,"
-msgstr "Bienvenue,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Modifier votre mot de passe"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "D�connection"
+#: 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
 #, fuzzy, python-format
@@ -535,6 +721,44 @@ msgstr ""
 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 ""
+
+#: 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 "actif"
+
+#: 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
@@ -652,6 +876,66 @@ msgstr "Merci d'utiliser notre site!"
 msgid "The %(site_name)s team"
 msgstr "L'�quipe %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "id de l'objet"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "redirig� depuis"
@@ -857,17 +1141,18 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: utils/timesince.py:13
+#, fuzzy
 msgid "month"
 msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "contenu"
+msgstr[1] "contenu"
 
 #: utils/timesince.py:14
 #, fuzzy
 msgid "day"
 msgid_plural "days"
-msgstr[0] "Mai"
-msgstr[1] "Mai"
+msgstr[0] "Lundi"
+msgstr[1] "Lundi"
 
 #: utils/timesince.py:15
 msgid "hour"
@@ -1039,85 +1324,127 @@ msgstr "Dates importantes"
 msgid "Message"
 msgstr "Message"
 
-#: 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 "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
 #, fuzzy
 msgid "Danish"
 msgstr "Espagnol"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Allemand"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Anglais"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Fran�ais"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "Galicien"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 #, fuzzy
 msgid "Italian"
 msgstr "Italien"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Br�silien"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Russe"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 #, fuzzy
 msgid "Serbian"
 msgstr "Serbe"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr ""
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "Ce champ est invalide."
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "Les lettres minuscules ne sont pas autoris�es ici."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Entrez un nombre entier."
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Entrez un nombre entier."
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Entrez un nombre entier."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr ""
@@ -1392,19 +1719,39 @@ 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:111
+#: core/meta/fields.py:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Entrez une adresse IP valide."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "S�parez les ID par des virgules."
 
-#: 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 ""
 "Maintenez \"Control\", or \"Command\" sur un Mac, pour en s�lectionner plus "
 "d'une."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Utilisez une chaine crypt�e MD5 -- pas un mot de passe en clair."
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Entrez une adresse de courriel valide."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
 
 #~ msgid "Traditional Chinese"
 #~ msgstr "Chinois traditionnel"
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index 14eb9896ad..3ad4bbae2c 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 88015860b4..194e1d167f 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-23 11:34-0600\n"
+"POT-Creation-Date: 2005-11-23 00:05+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"
@@ -268,6 +268,50 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 #, fuzzy
 msgid "action time"
@@ -297,6 +341,134 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Entrar"
+
+#: 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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administración de Django"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Faga clic para modificar"
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Engadir"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Cambiar contrasinal"
+
 #: 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
@@ -371,18 +543,73 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Inicio"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Engadir"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Engadir"
+
+#: 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 "Non ten permiso para editar nada."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Accións recentes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "As miñas accións"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ningunha dispoñíbel"
+
+#: contrib/admin/templates/admin/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Erro do servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Erro do servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Erro do servidor <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Houbo un erro. Xa se informou aos administradores do sitio por correo "
+"electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia."
+
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Histórico"
 
@@ -418,60 +645,6 @@ msgstr "Administración de sitio Django"
 msgid "Django administration"
 msgstr "Administración de Django"
 
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "Erro do servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Erro do servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Erro do servidor <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Houbo un erro. Xa se informou aos administradores do sitio por correo "
-"electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Páxina non atopada"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Sentímolo, pero non se atopou a páxina solicitada."
-
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Engadir"
-
-#: 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 "Non ten permiso para editar nada."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Accións recentes"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "As miñas accións"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ningunha dispoñíbel"
-
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Usuario:"
@@ -484,21 +657,32 @@ msgstr "Contrasinal:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">Esqueceu o contrasinal</a>?"
 
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Entrar"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Páxina non atopada"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Benvido,"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Sentímolo, pero non se atopou a páxina solicitada."
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Cambiar contrasinal"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Saír"
+#: 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
 #, fuzzy, python-format
@@ -524,6 +708,43 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Si, estou seguro"
 
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Benvido,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambiar contrasinal"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Saír"
+
+#: 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
+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
@@ -638,6 +859,65 @@ msgstr "Grazas por usar o noso sitio web!"
 msgid "The %(site_name)s team"
 msgstr "O equipo de %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr ""
@@ -1014,82 +1294,120 @@ msgstr ""
 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 "Danish"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr ""
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+msgid "This field is required."
+msgstr ""
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+msgid "Line breaks are not allowed here."
+msgstr ""
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr ""
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Enderezo de correo electrónico:"
+
+#: core/formfields.py:677
+msgid "Enter a whole number between 0 and 32,767."
+msgstr ""
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Este valor soamente pode conter letras, números e guións baixos (_)."
@@ -1337,14 +1655,34 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr ""
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: 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 ""
 
-#~ msgid "Click to change"
-#~ msgstr "Faga clic para modificar"
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Enderezo de correo electrónico:"
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index af5c7101c1..5f9e335d9c 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 f88409ab64..641999b2f9 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-23 11:35-0600\n"
+"POT-Creation-Date: 2005-11-23 00:06+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"
@@ -280,6 +280,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "mánudagur"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "nóv."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "tími aðgerðar"
@@ -308,6 +354,134 @@ msgstr "kladdafærsla"
 msgid "log entries"
 msgstr "kladdafærslur"
 
+#: contrib/admin/templatetags/admin_list.py:244
+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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Django vefstjórn"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Bæta við"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Breyta"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Breyta"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -384,18 +558,72 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Heim"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Bæta við"
+
+#: 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
+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"
 
@@ -431,59 +659,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:"
@@ -496,21 +671,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
@@ -535,6 +721,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
@@ -652,6 +876,66 @@ msgstr "Takk fyrir að nota vefinn okkar!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s hópurinn"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "einkenni hlutar"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "beina frá"
@@ -1033,83 +1317,125 @@ msgstr "Mikilvægar dagsetningar"
 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
 #, fuzzy
 msgid "Danish"
 msgstr "Spænska"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Þýska"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Enska"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Spænska"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Franska"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "Galíska"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "Ítalska"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr "Norska"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Brasilíska"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr "Rúmenska"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Rússneska"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr "Slóvanska"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr "Serbíska"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "Einfölduð Kínverska "
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "Þessi reitur er ótækur."
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "Lágstafir eru ekki leyfðir hér."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Settu inn heila tölu."
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Settu inn heila tölu."
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Settu inn heila tölu."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Þetta gildi má einungis innihalda stafi, tölur og undirstrik."
@@ -1372,16 +1698,40 @@ 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:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Vinsamlegast skrifaðu gilda IP tölu."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: 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 ""
 "Haltu niðri \"Control\", eða \"Command\" á Mac til þess að velja fleira en "
 "eitt."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Notaðu MD5 hakk -- ekki hrátt lykilorðið"
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Skrifaðu gilt tölvupóstfang."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "count"
+#~ msgstr "innihald"
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 73427cb57d..4cec17c1d4 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 281bc84a0c..1ccbf82105 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-23 11:35-0600\n"
+"POT-Creation-Date: 2005-11-23 00:05+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"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Luned�"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "data azione"
@@ -306,6 +352,134 @@ msgstr "voce di log"
 msgid "log entries"
 msgstr "voci di log"
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Accedi"
+
+#: 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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Amministrazione Django"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Clicca per cambiare"
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Aggiungi"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Cambia"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Cambia"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -382,18 +556,73 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Pagina iniziale"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Aggiungi"
+
+#: 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
+#, fuzzy
+msgid "Server error"
+msgstr "Errore del server (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Errore del server (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Errore del Server <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"C'� stato un errore. E' stato riportato agli amministratori del sito via e-"
+"mail e verr� risolto a breve. Grazie per la pazienza."
+
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Storia"
 
@@ -429,60 +658,6 @@ msgstr "Amministrazione sito Django"
 msgid "Django administration"
 msgstr "Amministrazione Django"
 
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "Errore del server (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Errore del server (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Errore del Server <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"C'� stato un errore. E' stato riportato agli amministratori del sito via e-"
-"mail e verr� risolto a breve. Grazie per la pazienza."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Pagina non trovata"
-
-#: contrib/admin/templates/admin/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
-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/login.html:15
 msgid "Username:"
 msgstr "Nome utente:"
@@ -495,21 +670,32 @@ 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/login.html:24
-msgid "Log in"
-msgstr "Accedi"
+#: 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 "Welcome,"
-msgstr "Benvenuto,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Cambia la password"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Esci"
+#: 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
 #, fuzzy, python-format
@@ -535,6 +721,44 @@ msgstr ""
 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 ""
+
+#: 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 "attivo"
+
+#: 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
@@ -650,6 +874,66 @@ msgstr "Ti ringraziamo per l'utilizzo del nostro sito!"
 msgid "The %(site_name)s team"
 msgstr "Il team di %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "id dell'oggetto"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "redirigi da"
@@ -1032,84 +1316,126 @@ msgstr "Date importanti"
 msgid "Message"
 msgstr "Messaggio"
 
-#: 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
 #, fuzzy
 msgid "Danish"
 msgstr "Spagnolo"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Tedesco"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Inglese"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Francese"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "Galiziano"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Brasiliano"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Russo"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 #, fuzzy
 msgid "Serbian"
 msgstr "Serbo"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr ""
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "Il campo non � valido."
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "Non sono ammesse lettere minuscole."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Inserire un numero."
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Inserire un numero."
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Inserire un numero."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Sono ammesse solo lettere, numeri e sottolineature ('_')."
@@ -1374,23 +1700,44 @@ msgstr ""
 "L'attributo \"%(attr)s\" alla linea %(line)s ha un valore non valido. (La "
 "linea comincia con \"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Inserire un indirizzo IP valido."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " Separa ID multipli con virgole."
 
-#: 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 " Premi \"Control\", o \"Command\" su Mac, per selezionarne pi� di uno."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Usare il codice di controllo MD5 -- non la password."
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Inserire un indirizzo e-mail valido."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "count"
+#~ msgstr "contenuto"
 
 #~ msgid "Itialian"
 #~ msgstr "Italiano"
 
 #~ msgid "Server error <em>(500)</em>"
 #~ msgstr "Errore del server <em>(500)</em>"
-
-#~ msgid "Click to change"
-#~ msgstr "Clicca per cambiare"
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index 7630c5fa4b..efb1b10e5c 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 532f24eef5..77f7f71719 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-23 11:35-0600\n"
+"POT-Creation-Date: 2005-11-23 00:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
 "Language-Team: Norwegian\n"
@@ -20,7 +20,7 @@ msgstr ""
 #: contrib/comments/models/comments.py:161
 #, fuzzy
 msgid "object ID"
-msgstr "objekt id"
+msgstr "Vis objekt ID"
 
 #: contrib/comments/models/comments.py:9
 msgid "headline"
@@ -79,9 +79,8 @@ msgid "is public"
 msgstr ""
 
 #: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
-#, fuzzy
 msgid "IP address"
-msgstr "e-post adresse"
+msgstr "IP adresse"
 
 #: contrib/comments/models/comments.py:27
 msgid "is removed"
@@ -126,7 +125,7 @@ msgstr "fornavn"
 #: contrib/comments/models/comments.py:166
 #, fuzzy
 msgid "ip address"
-msgstr "e-post adresse"
+msgstr "IP adresse"
 
 #: contrib/comments/models/comments.py:168
 msgid "approved by staff"
@@ -185,12 +184,15 @@ msgid "Flag by %r"
 msgstr ""
 
 #: contrib/comments/models/comments.py:271
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "This comment was flagged by %(user)s:\n"
 "\n"
 "%(text)s"
 msgstr ""
+"Denne kommentaren er skrevet med lite omtanke:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/models/comments.py:278
 #, fuzzy
@@ -212,24 +214,24 @@ msgstr ""
 
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
-msgstr ""
+msgstr "Anonyme brukere kan ikke stemme"
 
 #: contrib/comments/views/karma.py:22
-#, fuzzy
 msgid "Invalid comment ID"
-msgstr "tillat kommentarer"
+msgstr "Ikke gyldig kommentar ID"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
-msgstr ""
+msgstr "Du kan ikke stemme selv"
 
 #: contrib/comments/views/comments.py:25
+#, fuzzy
 msgid ""
 "This rating is required because you've entered at least one other rating."
-msgstr ""
+msgstr "Denne bla bla.."
 
 #: contrib/comments/views/comments.py:109
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "This comment was posted by a user who has posted fewer than %(count)s "
 "comment:\n"
@@ -241,46 +243,107 @@ msgid_plural ""
 "\n"
 "%(text)s"
 msgstr[0] ""
+"Denne kommentaren var skrevet av en bruker som har fra før skrevet under %"
+"(count)s kommentarer:\n"
+"\n"
+"%(text)s"
 msgstr[1] ""
+"Denne kommentaren var skrevet av en bruker som har fra før skrevet under %"
+"(count)s kommentarer:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/views/comments.py:114
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "This comment was posted by a sketchy user:\n"
 "\n"
 "%(text)s"
 msgstr ""
+"Denne kommentaren er skrevet med lite omtanke:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/views/comments.py:186
 #: contrib/comments/views/comments.py:277
 msgid "Only POSTs are allowed"
-msgstr ""
+msgstr "Bare POST er tillatt"
 
 #: contrib/comments/views/comments.py:190
 #: contrib/comments/views/comments.py:281
 msgid "One or more of the required fields wasn't submitted"
-msgstr ""
+msgstr "En eller flere av feltene som er krevd ble ikke sendt."
 
 #: contrib/comments/views/comments.py:194
 #: contrib/comments/views/comments.py:283
 msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
+msgstr "Noen har endret på komentar feltene (sikkerhets advarsel)"
 
 #: contrib/comments/views/comments.py:204
 #: contrib/comments/views/comments.py:289
 msgid ""
 "The comment form had an invalid 'target' parameter -- the object ID was "
 "invalid"
-msgstr ""
+msgstr "Skjemaet hadde en ugyldig verdi - objekt IDen var ugyldig"
 
 #: contrib/comments/views/comments.py:254
 #: contrib/comments/views/comments.py:318
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
+"Kommentar skjemaet returnerte ikke et 'forhåndsvisning' eller 'post' objekt"
+
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Av %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr "Alle"
+
+#: contrib/admin/filterspecs.py:100
+#, fuzzy
+msgid "Any date"
+msgstr "Alle datoer"
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Mondag"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr "Ukjent"
 
 #: contrib/admin/models/admin.py:6
 msgid "action time"
-msgstr "handlings tid"
+msgstr "tid for handling"
 
 #: contrib/admin/models/admin.py:9
 msgid "object id"
@@ -306,69 +369,199 @@ msgstr "logg notis"
 msgid "log entries"
 msgstr "logg innlegg"
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr "Alle datoer"
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Log 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 ""
+"Du må logge inn igjen, fordi sesjonen din har gått ut på dato, men ikke ikke "
+"bekjymr deg informasjonen du sendte ble lagret."
+
+#: 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 ""
+"Det ser ut som om nettleseren din ikke vill ta i mot informasjonskapsler "
+"('cookies'). Vennligst omkonfigurer nettleseren din, last siden på ny og "
+"prøv igjen."
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr "Brukernavnet kan ikke inneholde '@'"
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Epost adressen din er ikke brukernavnet ditt, prøv '%s' i stede."
+
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Django administrasjon"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr "Velg %s"
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr "Velg %s for å endre"
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" ble lagt inn i databasen."
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr "Du kan endre under"
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr "Du kan legge til en ny %s under."
+
+#: contrib/admin/views/main.py:451
+#, python-format
+msgid "Add %s"
+msgstr "Ny %s"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr "La til %s"
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr "og"
+
+#: contrib/admin/views/main.py:469
+#, python-format
+msgid "Changed %s."
+msgstr "Endret %s."
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr "Slettet %s."
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr "Ingen felt endret."
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" ble endret."
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under."
+
+#: contrib/admin/views/main.py:546
+#, python-format
+msgid "Change %s"
+msgstr "Endre %s"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "En eller flere %(fieldname)s i %(name)s: %(obj)s"
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "En eller flere %(fieldname)s i %(name)s:"
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)s \"%(obj)s\" ble slettet."
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+
+#: contrib/admin/views/main.py:678
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Endre historien: %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
 msgid "Integer"
-msgstr ""
+msgstr "Heltall"
 
 #: contrib/admin/views/doc.py:263
+#, fuzzy
 msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Boolean (Enten \"True\" eller \"False\")"
 
 #: contrib/admin/views/doc.py:264
 #, python-format
 msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr "Tekst (opp til %(maxlength)s tegn)"
 
 #: contrib/admin/views/doc.py:265
 msgid "Comma-separated integers"
-msgstr ""
+msgstr "Heltall skilt med kommaer"
 
 #: contrib/admin/views/doc.py:266
-#, fuzzy
 msgid "Date (without time)"
-msgstr "handlings tid"
+msgstr "Dato (uten tid)"
 
 #: contrib/admin/views/doc.py:267
-#, fuzzy
 msgid "Date (with time)"
 msgstr "Dato/tid"
 
 #: contrib/admin/views/doc.py:268
-#, fuzzy
 msgid "E-mail address"
-msgstr "Epost adresse:"
+msgstr "Epost adresse"
 
 #: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
 msgid "File path"
-msgstr ""
+msgstr "Sti til fil"
 
 #: contrib/admin/views/doc.py:270
-#, fuzzy
 msgid "Decimal number"
-msgstr "Desember"
+msgstr "Desimal tall"
 
 #: contrib/admin/views/doc.py:276
+#, fuzzy
 msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Boolean (enten \"True\", \"False\" eller \"None\")"
 
 #: contrib/admin/views/doc.py:277
-#, fuzzy
 msgid "Phone number"
-msgstr "Skriv inn et helt nummer."
+msgstr "Telefonnummer"
 
 #: contrib/admin/views/doc.py:280
 msgid "String (up to 50)"
-msgstr ""
+msgstr "Tekst (opp til 50 tegn)"
 
 #: contrib/admin/views/doc.py:282
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #: contrib/admin/views/doc.py:283
 msgid "Time"
-msgstr ""
+msgstr "Tid"
 
 #: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
@@ -376,89 +569,33 @@ msgstr "Internettadresse"
 
 #: contrib/admin/views/doc.py:285
 msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr "Stat (i USA, to store bokstaver)"
 
 #: contrib/admin/views/doc.py:286
 msgid "XML text"
-msgstr ""
+msgstr "XML tekst"
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Hjem"
 
-#: contrib/admin/templates/admin/object_history.html:5
-msgid "History"
-msgstr "Historie"
-
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "Dato/tid"
-
-#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
-msgid "User"
-msgstr "Bruker"
-
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
-msgstr "Funksjon"
-
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "N j, Y, P"
-
-#: contrib/admin/templates/admin/object_history.html:36
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
-msgstr ""
-"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/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/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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Legg til %(name)s"
 
 #: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
 msgid "Add"
 msgstr "Legg til"
 
@@ -482,6 +619,63 @@ msgstr "Mine handlinger"
 msgid "None available"
 msgstr "Ingen tilgjengelige"
 
+#: 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"
+msgstr "Historie"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "Dato/tid"
+
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
+msgid "User"
+msgstr "Bruker"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "Funksjon"
+
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "j. M U - h:i"
+
+#: contrib/admin/templates/admin/object_history.html:36
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"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:"
@@ -494,21 +688,32 @@ 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/login.html:24
-msgid "Log in"
-msgstr "Log inn"
+#: 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 "Welcome,"
-msgstr "Velkommen"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Endre passord"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Vis på siden"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Log ut"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Vennligst fiks feilen under."
+msgstr[1] "Vennligst fiks feilene under."
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Rekkefølge"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Rekkefølge:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -533,6 +738,43 @@ msgstr ""
 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 "Slett"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Lagre som ny"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Lagre og legg til en ny"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Lagre og fortsett å endre"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Lagre"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr "Av %(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
@@ -648,6 +890,71 @@ msgstr "Takk for at du bruker vår side!"
 msgid "The %(site_name)s team"
 msgstr "Hilsen %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Bokmerker"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "Dokumentasjon bokmerker"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Dokumentasjon for denne siden"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Hopp fra hvilken som helst side til dokumentasjonen for visnings funksjonen "
+"som laget siden."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "Vis objekt ID"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Viser \"content-type\" og en unik ID for sider som representerer et enkelt "
+"objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "Endre dette objektet (åpnes i dette vinduet)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+#, fuzzy
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+"Hopp til administrasjonsiden for siden som representerer et enkelt objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "Endre dette objektet (åpnes i et nytt vindu)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr "Samme som over, men åpner administrasjonsiden i et nytt vindu."
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "omadresser fra"
@@ -703,7 +1010,6 @@ 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'."
@@ -731,15 +1037,15 @@ msgstr "flatsider"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
-msgstr ""
+msgstr "j. M U"
 
 #: utils/translation.py:336
 msgid "DATETIME_FORMAT"
-msgstr ""
+msgstr "j. M U - h:i"
 
 #: utils/translation.py:337
 msgid "TIME_FORMAT"
-msgstr ""
+msgstr "h:i"
 
 #: utils/dates.py:6
 msgid "Monday"
@@ -1033,82 +1339,119 @@ msgstr "Viktige datoer"
 msgid "Message"
 msgstr "Meldinger"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Bengali"
 msgstr "Bengalsk"
 
-#: 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 "Walisisk"
 
-#: conf/global_settings.py:39
-msgid "Danish"
-msgstr "Dnask"
-
 #: conf/global_settings.py:40
+msgid "Danish"
+msgstr "Dansk"
+
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Tysk"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Engelsk"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Spansk"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Fransk"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "Galisisk"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "Italiensk"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Brasiliansk"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr "Romansk"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Russisk"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr "Svensk"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "Simplifisert Kinesisk"
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+msgid "This field is required."
+msgstr "Dette feltet er påkrevd."
+
+#: core/formfields.py:339
+#, fuzzy, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Sjekk at teksten er kortere enn %s bokstaver"
+msgstr[1] "Sjekk at teksten er kortere enn %s bokstaver"
+
+#: core/formfields.py:344
+msgid "Line breaks are not allowed here."
+msgstr "Det er ikke tillatt med flere linjer her."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Velg et av valga; '%(data)s' er ikke i %(choices)s."
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr "Filen er tom."
+
+#: core/formfields.py:659
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Skriv inn et heltall mellom -31768 og 32767."
+
+#: core/formfields.py:668
+msgid "Enter a positive number."
+msgstr "Skriv inn et positivt heltall."
+
+#: core/formfields.py:677
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Skriv inn et heltall mellom 0 og 32767."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Dette feltet må bare inneholde bokstaver, nummer og understreker."
@@ -1377,15 +1720,45 @@ msgstr ""
 "\"%(attr)s\" tillegg på linje $(line)s har en ikke godkjent verdi. (Linja "
 "starter med \"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Vennligst skriv inn en godkjent IP adresse."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "$(optname)s med %(fieldname)s finnes allerede."
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Separer Id-ene med kommaer."
 
-#: 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 ""
 "Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Bruk en MD5 nøkkel -- ikke passordet i ren tekst"
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Skriv inn en godkjent e-post adresse."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
+
+#~ msgid "Error in Template"
+#~ msgstr "Feil i mal"
+
+#~ msgid ""
+#~ "\n"
+#~ "In template %(name)s, error at line %(line)s:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "I mal %(name)s, var det en feil på linje %(line)s:\n"
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 8bb9fdb9bc..4655e7be3f 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 0219f363e3..a1c44ead54 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-23 11:34-0600\n"
+"POT-Creation-Date: 2005-11-23 00:05+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"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Segunda Feira"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "hora da ação"
@@ -306,6 +352,134 @@ msgstr "entrada de log"
 msgid "log entries"
 msgstr "entradas de log"
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Acessar"
+
+#: 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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administração do Django"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Clique para alterar"
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Adicionar"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -382,18 +556,73 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Início"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Adicionar"
+
+#: 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
+#, fuzzy
+msgid "Server error"
+msgstr "Erro no servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Erro no servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Erro no Servidor <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Houve um erro. Este foi reportado aos administradores do site através d e-"
+"mail e deve ser consertado em breve. Obrigado pela compreensão."
+
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Histórico"
 
@@ -429,60 +658,6 @@ msgstr "Site de administração do Django"
 msgid "Django administration"
 msgstr "Administração do Django"
 
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "Erro no servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Erro no servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Erro no Servidor <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Houve um erro. Este foi reportado aos administradores do site através d e-"
-"mail e deve ser consertado em breve. Obrigado pela compreensão."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Página não encontrada"
-
-#: contrib/admin/templates/admin/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
-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/login.html:15
 msgid "Username:"
 msgstr "Usuário:"
@@ -495,21 +670,32 @@ 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/login.html:24
-msgid "Log in"
-msgstr "Acessar"
+#: 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 "Welcome,"
-msgstr "Bem vindo,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Alterar senha"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Encerrar sessão"
+#: 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
 #, fuzzy, python-format
@@ -535,6 +721,44 @@ msgstr ""
 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 ""
+
+#: 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 "ativar"
+
+#: 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
@@ -649,6 +873,66 @@ msgstr "Obrigado por usar nosso site!"
 msgid "The %(site_name)s team"
 msgstr "Time do %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "id do objeto"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "redirecionar de"
@@ -1036,84 +1320,126 @@ msgstr "Datas importantes"
 msgid "Message"
 msgstr "Mensagem"
 
-#: 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 "Tcheco"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 #, fuzzy
 msgid "Danish"
 msgstr "Espanhol"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Alemão"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Inglês"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Francês"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "Galiciano"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Brazileiro"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Russo"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 #, fuzzy
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr ""
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "Este campo é inválido."
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "Letras em minúsculo não são permitidas aqui."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Informe um número inteiro."
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Informe um número inteiro."
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Informe um número inteiro."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Deve conter apenas letras, números e sublinhados (_)."
@@ -1378,19 +1704,40 @@ msgstr ""
 "O atributo \"%(attr)s\" na linha %(line)s tem um valor inválido. (Linha "
 "começa com \"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Informe um endereço IP válido."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " Separe IDs múltiplos com vírgulas."
 
-#: 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 ""
 " Mantenha pressionado \"Control\", ou \"Command\" num Mac para selecionar "
 "mais de uma opção."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Usar um código MD5 -- não o texto da senha."
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Informe um endereço de email válido."
 
-#~ msgid "Click to change"
-#~ msgstr "Clique para alterar"
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "count"
+#~ msgstr "conteúdo"
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 6853fcd59f..01c98da1a7 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 da13e676d5..bf0ca36809 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-23 18:34+0100\n"
+"POT-Creation-Date: 2005-11-23 00:06+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"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Luni"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Noi."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "timp acţiune"
@@ -306,6 +352,134 @@ msgstr "intrare log"
 msgid "log entries"
 msgstr "intrări log"
 
+#: contrib/admin/templatetags/admin_list.py:244
+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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administrare Django"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Adaugă"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Schimbă"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Schimbă"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -382,18 +556,72 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Acasă"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Adaugă"
+
+#: 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
+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"
 
@@ -429,59 +657,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:"
@@ -494,21 +669,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
@@ -534,6 +720,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
@@ -648,6 +872,66 @@ msgstr "Mulţumesc pentru folosirea saitului nostru!"
 msgid "The %(site_name)s team"
 msgstr "Echipa %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "id obiect"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "redirectat de la "
@@ -1033,83 +1317,125 @@ msgstr "Date importante"
 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
 #, fuzzy
 msgid "Danish"
 msgstr "Spaniolă"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Germană"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Engleză"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Spaniolă"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Franceză"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "Galiciană"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "Italiană"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr "Norvegiană"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Braziliană"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Rusă"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr "Sîrbă"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "Chineză simplificată"
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "Cîmpul este invalid."
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "Literele mici nu sînt permise aici."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Introduceţi un număr întreg."
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Introduceţi un număr întreg."
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Introduceţi un număr întreg."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr ""
@@ -1378,16 +1704,40 @@ 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:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Introduceţi vă rog o adresă IP validă."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: 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 ""
 " Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru a selecta mai "
 "multe."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Foloseşte un hash MD5 -- nu parola brută"
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Introduceţi o adresă de email validă."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "count"
+#~ msgstr "conţinut"
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index fe6ae8b76d..2a59acdee8 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 8f78049cd1..921557eddf 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-23 11:34-0600\n"
+"POT-Creation-Date: 2005-11-23 00:05+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"
@@ -26,9 +26,8 @@ msgstr ""
 
 #: contrib/comments/models/comments.py:10
 #: contrib/comments/models/comments.py:162
-#, fuzzy
 msgid "comment"
-msgstr "����������"
+msgstr ""
 
 #: contrib/comments/models/comments.py:11
 msgid "rating #1"
@@ -96,15 +95,13 @@ msgid "Comment"
 msgstr ""
 
 #: contrib/comments/models/comments.py:32
-#, fuzzy
 msgid "Comments"
-msgstr "������������ �����������"
+msgstr ""
 
 #: contrib/comments/models/comments.py:85
 #: contrib/comments/models/comments.py:204
-#, fuzzy
 msgid "Content object"
-msgstr "��� ����������"
+msgstr ""
 
 #: contrib/comments/models/comments.py:113
 #, python-format
@@ -117,9 +114,8 @@ msgid ""
 msgstr ""
 
 #: contrib/comments/models/comments.py:163
-#, fuzzy
 msgid "person's name"
-msgstr "���"
+msgstr ""
 
 #: contrib/comments/models/comments.py:166
 #, fuzzy
@@ -131,23 +127,20 @@ msgid "approved by staff"
 msgstr ""
 
 #: contrib/comments/models/comments.py:172
-#, fuzzy
 msgid "Free comment"
-msgstr "������������ �����������"
+msgstr ""
 
 #: contrib/comments/models/comments.py:173
-#, fuzzy
 msgid "Free comments"
-msgstr "������������ �����������"
+msgstr ""
 
 #: contrib/comments/models/comments.py:209
 msgid "score"
 msgstr ""
 
 #: contrib/comments/models/comments.py:210
-#, fuzzy
 msgid "score date"
-msgstr "���� ���������"
+msgstr ""
 
 #: contrib/comments/models/comments.py:213
 msgid "Karma score"
@@ -163,9 +156,8 @@ msgid "%(score)d rating by %(user)s"
 msgstr ""
 
 #: contrib/comments/models/comments.py:248
-#, fuzzy
 msgid "flag date"
-msgstr "������� ��������"
+msgstr ""
 
 #: contrib/comments/models/comments.py:251
 #, fuzzy
@@ -191,9 +183,8 @@ msgid ""
 msgstr ""
 
 #: contrib/comments/models/comments.py:278
-#, fuzzy
 msgid "deletion date"
-msgstr "������ ������"
+msgstr ""
 
 #: contrib/comments/models/comments.py:281
 msgid "Moderator deletion"
@@ -213,9 +204,8 @@ msgid "Anonymous users cannot vote"
 msgstr ""
 
 #: contrib/comments/views/karma.py:22
-#, fuzzy
 msgid "Invalid comment ID"
-msgstr "������������ �����������"
+msgstr ""
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
@@ -276,6 +266,50 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 #, fuzzy
 msgid "action time"
@@ -305,6 +339,134 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
+#: contrib/admin/templatetags/admin_list.py:244
+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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "����������������� Django"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "�������� ��� ���������"
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "��������"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "��������"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "��������"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -344,18 +506,16 @@ msgid "File path"
 msgstr ""
 
 #: contrib/admin/views/doc.py:270
-#, fuzzy
 msgid "Decimal number"
-msgstr "�������"
+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 "������� �����"
+msgstr ""
 
 #: contrib/admin/views/doc.py:280
 msgid "String (up to 50)"
@@ -381,18 +541,73 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "������"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+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
+#, fuzzy
+msgid "Server error"
+msgstr "������ ������� (500)"
+
+#: 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 ""
+"��������� ������. ����� �� ������ ��������� ��������������� ����� �� e-mail� "
+"��� ������ ���� ������ ����������. ���������� ��� �� �������� � ������."
+
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "�������"
 
@@ -428,59 +643,6 @@ msgstr "
 msgid "Django administration"
 msgstr "����������������� Django"
 
-#: 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 ""
-"��������� ������. ����� �� ������ ��������� ��������������� ����� �� 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
-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 "���:"
@@ -493,21 +655,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
 #, fuzzy, python-format
@@ -533,6 +706,43 @@ 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
+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
@@ -647,6 +857,65 @@ msgstr "
 msgid "The %(site_name)s team"
 msgstr "������� ����� di %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "������������� ��"
@@ -683,7 +952,7 @@ msgstr "
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
-"������: '/about/contact/'. ������ ��������, ��� �������� ����������� ����."
+"������: '/about/contact/'. ������ ��������, ��� �������� ������������ ����."
 
 #: contrib/flatpages/models/flatpages.py:8
 msgid "title"
@@ -702,13 +971,10 @@ 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"
@@ -1035,82 +1301,120 @@ msgstr "
 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 "Danish"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "������"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr ""
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+msgid "This field is required."
+msgstr ""
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+msgid "Line breaks are not allowed here."
+msgstr ""
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr ""
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "E-mail �����:"
+
+#: core/formfields.py:677
+msgid "Enter a whole number between 0 and 32,767."
+msgstr ""
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "�������� ����� ��������� ������ �����, ����� � �������������."
@@ -1370,22 +1674,46 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr ""
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "���������� ��������� ID �������."
 
-#: 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 ""
 " ����������� \"Control\", ��� \"Command\" �� ��������, ��� ������ ������ ��� "
 "������."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "����������� MD5 ��� -- ������ �� �������������� ������."
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "E-mail �����:"
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
+
+#~ msgid ""
+#~ "Example: 'flatfiles/contact_page'. If this isn't provided, the system "
+#~ "will use 'flatfiles/default'."
+#~ msgstr ""
+#~ "������: 'flatfiles/contact_page'. ���� �� �������������, ������� ����� "
+#~ "������������ 'flatfiles/default'."
 
 #~ msgid "Server error <em>(500)</em>"
 #~ msgstr "������ ������� <em>(500)</em>"
-
-#~ msgid "Click to change"
-#~ msgstr "�������� ��� ���������"
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 9fddf972d3..26d18a6cec 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 57bd38c2fd..35d2182837 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-24 06:34-0500\n"
-"PO-Revision-Date: 2005-11-10 23:22-0500\n"
+"POT-Creation-Date: 2005-11-23 00:06+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"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgstr "presmerovania"
 #: contrib/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
 msgid "object ID"
-msgstr "objekt ID"
+msgstr "Ukáž objekt id"
 
 #: contrib/comments/models/comments.py:9
 msgid "headline"
@@ -100,12 +100,12 @@ msgstr "je platné hodnotenie"
 #: contrib/comments/models/comments.py:24
 #: contrib/comments/models/comments.py:164
 msgid "date/time submitted"
-msgstr "dátum/čas poslania"
+msgstr "dítum/čas odoslania"
 
 #: contrib/comments/models/comments.py:25
 #: contrib/comments/models/comments.py:165
 msgid "is public"
-msgstr "je zveréjnený"
+msgstr "je zverejnený"
 
 #: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
 msgid "IP address"
@@ -120,8 +120,8 @@ msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
-"Ak je tento komentár nevhodný, tu ho poznačte.  \"Tento komentár bol vymazaný"
-"\" táto správa sa objaví namiesto neho."
+"Označ túto voľbu ak je komentár nevhodný.  \"Tento komentár bol vymazaný\" "
+"sa zobrazí namiesto neho."
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
@@ -134,7 +134,7 @@ msgstr "Komentáre"
 #: contrib/comments/models/comments.py:85
 #: contrib/comments/models/comments.py:204
 msgid "Content object"
-msgstr "Obsah objektu"
+msgstr "Obsah objectu"
 
 #: contrib/comments/models/comments.py:113
 #, python-format
@@ -145,7 +145,7 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
-"Poslal  %(user)s at %(date)s\n"
+"Poslal %(user)s at %(date)s\n"
 "\n"
 "%(comment)s\n"
 "\n"
@@ -153,7 +153,7 @@ msgstr ""
 
 #: contrib/comments/models/comments.py:163
 msgid "person's name"
-msgstr "krstné meno"
+msgstr "meno osoby"
 
 #: contrib/comments/models/comments.py:166
 msgid "ip address"
@@ -161,7 +161,7 @@ msgstr "ip adresa"
 
 #: contrib/comments/models/comments.py:168
 msgid "approved by staff"
-msgstr "je zamestnancom"
+msgstr "schvalený za zamestnanca"
 
 #: contrib/comments/models/comments.py:172
 msgid "Free comment"
@@ -181,20 +181,20 @@ msgstr "údaje stavu"
 
 #: contrib/comments/models/comments.py:213
 msgid "Karma score"
-msgstr "Karma údaj"
+msgstr "Karma stav"
 
 #: contrib/comments/models/comments.py:214
 msgid "Karma scores"
-msgstr "Karma údaje"
+msgstr "Karma stavy"
 
 #: contrib/comments/models/comments.py:223
 #, python-format
 msgid "%(score)d rating by %(user)s"
-msgstr "%(score)d hodnotil %(user)s"
+msgstr "%(score)d hodnotil  %(user)s"
 
 #: contrib/comments/models/comments.py:248
 msgid "flag date"
-msgstr "dátumové návestie"
+msgstr "návestie dátumu"
 
 #: contrib/comments/models/comments.py:251
 msgid "User flag"
@@ -207,55 +207,56 @@ msgstr "Návestia užívateľa"
 #: contrib/comments/models/comments.py:256
 #, python-format
 msgid "Flag by %r"
-msgstr " %r návestie"
+msgstr "Návestie %r"
 
 #: contrib/comments/models/comments.py:271
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "This comment was flagged by %(user)s:\n"
 "\n"
 "%(text)s"
 msgstr ""
-"Tento komentár bol označený  %(user)s:\n"
+"Tento komentár bol označený %(user)s:\n"
 "\n"
 "%(text)s"
 
 #: contrib/comments/models/comments.py:278
 msgid "deletion date"
-msgstr "odstránené dátumy"
+msgstr "vymazaný dátum"
 
 #: contrib/comments/models/comments.py:281
 msgid "Moderator deletion"
-msgstr "Moderátor odstránenia"
+msgstr "Prostredník mazania"
 
 #: contrib/comments/models/comments.py:282
 msgid "Moderator deletions"
-msgstr "Moderátor odstránení"
+msgstr "Prostredník mazaní"
 
 #: contrib/comments/models/comments.py:286
 #, python-format
 msgid "Moderator deletion by %r"
-msgstr "Moderátor odstránenia %r"
+msgstr "Prostredník mazania bol %r"
 
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
-msgstr "Hlasovať môžu len prihlásení užívatelia"
+msgstr "Ak chcete hlasovať, najprv sa musíte prihlásiť"
 
 #: contrib/comments/views/karma.py:22
 msgid "Invalid comment ID"
-msgstr "Chybné ID komentára"
+msgstr "Neplatný komentár ID"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
-msgstr "Nemôžeš hlasovať za seba"
+msgstr "Nemožete voliť vlastný príspevok"
 
 #: contrib/comments/views/comments.py:25
 msgid ""
 "This rating is required because you've entered at least one other rating."
 msgstr "Toto hlasovanie je nevyhnutné, lebo súvisí s predchádzjúcou voľbou."
+"Táto voľba je nevyhnutná nakoľko je pokračovaním vašej predchádzajúcej."
 
 #: contrib/comments/views/comments.py:109
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "This comment was posted by a user who has posted fewer than %(count)s "
 "comment:\n"
@@ -267,12 +268,12 @@ msgid_plural ""
 "\n"
 "%(text)s"
 msgstr[0] ""
-"Tento komentár bol užívateľom ktorý doteraz poslal minimálne %(count)s "
+"Tento komentár bol poslaný užívateľom, ktorý ma menej než %(count)s "
 "komentár:\n"
 "\n"
 "%(text)s"
 msgstr[1] ""
-"Tento komentár bol užívateľom ktorý doteraz poslal najmenej %(count)s "
+"Tento komentár bol poslaný užívateľom, ktorý ma menej než %(count)s "
 "komentárov:\n"
 "\n"
 "%(text)s"
@@ -284,90 +285,87 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
-"Tento komentár je od veľmi náznakového užívateľa:\n"
+"Tento komentár bol poslaný prchkým uzívateľom:\n"
 "\n"
 "%(text)s"
 
 #: contrib/comments/views/comments.py:186
 #: contrib/comments/views/comments.py:277
 msgid "Only POSTs are allowed"
-msgstr "Dovolené sú len POST"
+msgstr "Sú povolené len POST metódy"
 
 #: contrib/comments/views/comments.py:190
 #: contrib/comments/views/comments.py:281
 msgid "One or more of the required fields wasn't submitted"
-msgstr "Jedno alebo viac povinných polí nebolo vložených"
+msgstr "Jedno alebo viac požadovaných polí nebolo postúpených"
 
 #: contrib/comments/views/comments.py:194
 #: contrib/comments/views/comments.py:283
 msgid "Somebody tampered with the comment form (security violation)"
-msgstr "Niekto skúšal manipulovať s formulárom komentára (porušená bezpečnosť)"
+msgstr "Bola zistena neoprávnená manipulácia s formulárom komentára "
 
 #: contrib/comments/views/comments.py:204
 #: contrib/comments/views/comments.py:289
 msgid ""
 "The comment form had an invalid 'target' parameter -- the object ID was "
 "invalid"
-msgstr ""
+msgstr "Formulár kometára má chybný výstupný parameter -- objectID bol chybný"
 "Formulár komentára ma chybný 'cieľový' parameter  -- the objekt ID bol "
 "poškodený"
 
 #: contrib/comments/views/comments.py:254
 #: contrib/comments/views/comments.py:318
 msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr "Formulár komentára neposkytuje odpoveď buď 'prezri' alebo 'pošli'"
+msgstr "Neprišla ani jedna z možných volieb 'preview' alebo 'post'"
 
-#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:284
-msgid "URL"
-msgstr "URL"
-
-#: contrib/flatpages/models/flatpages.py:7
+#: contrib/admin/filterspecs.py:32
+#, python-format
 msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+"<h3>By %s:</h3>\n"
+"<ul>\n"
 msgstr ""
-"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj "
-"záverečné lomítka."
+"<h3>Od %s:</h3>\n"
+"<ul>\n"
 
-#: contrib/flatpages/models/flatpages.py:8
-msgid "title"
-msgstr "názov"
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr "Všetko"
 
-#: contrib/flatpages/models/flatpages.py:9
-msgid "content"
-msgstr "obsah"
+#: contrib/admin/filterspecs.py:100
+#, fuzzy
+msgid "Any date"
+msgstr "Ľubovoľný dátum"
 
-#: contrib/flatpages/models/flatpages.py:10
-msgid "enable comments"
-msgstr "povolené komentáre"
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Dnes"
 
-#: contrib/flatpages/models/flatpages.py:11
-msgid "template name"
-msgstr "meno predlohy"
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr "Posledných 7 dní"
 
-#: contrib/flatpages/models/flatpages.py:12
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo,  systém použije  "
-"'flatpages/default'."
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr "Tento mesiac"
 
-#: contrib/flatpages/models/flatpages.py:13
-msgid "registration required"
-msgstr "musíte byť zaregistrovaný"
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr "Tento rok"
 
-#: 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/admin/filterspecs.py:134
+msgid "Yes"
+msgstr "Áno"
 
-#: contrib/flatpages/models/flatpages.py:17
-msgid "flat page"
-msgstr "plochá stránka"
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nie"
 
-#: contrib/flatpages/models/flatpages.py:18
-msgid "flat pages"
-msgstr "ploché stránky"
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr "Neznámy"
 
 #: contrib/admin/models/admin.py:6
 msgid "action time"
@@ -397,24 +395,159 @@ msgstr "záznam priebehu"
 msgid "log entries"
 msgstr "záznamy priebehu"
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr "Všetky dátumy"
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Prihlásenie"
+
+#: 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 ""
+"Prosím prihláste sa znova, vaše sedenie stratilo platnosť. Žiadne obavy: "
+"Všetko čo ste vložili bolo uchované."
+
+#: 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 ""
+"Vyzera, že váš prehliadač neakceptuje  cookies. Prosím povoľte cookies, "
+"znovu natiahnite túto stránku, a skúste znova."
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr "Meno užívateľa nemôže obsahovať znak '@'."
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+"Vaša emailová adresa nie je vaším užívateľským menon. Skuste toto '%s' "
+"namiesto nej"
+
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Spáva webu"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr "Vyber %s"
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr "Vyber %s na zmenu"
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr " %(name)s \"%(obj)s\" bol úspešne pridaný."
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr "Môžete to zmeniť znovu nižšie."
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr "Môžete pridať ďalší %s nižšie."
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Pridaj"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr "Pridal %s"
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr "a"
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Zmenený"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr "Vymazaný"
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr "Polia neboli zmenené."
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr " %(name)s \"%(obj)s\" bol úspešne zmenený."
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+" %(name)s \"%(obj)s\" bol úspešne pridaný. Môžete ho zmeniť zase nižšie."
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Zmeň"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Jeden alebo viac %(fieldname)s v %(name)s: %(obj)s"
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "jeden alebo viac %(fieldname)s v %(name)s:"
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr " %(name)s \"%(obj)s\" bol úspešne vymazaný."
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr "Ste si istý/á?"
+
+#: contrib/admin/views/main.py:678
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Zmena histórie:"
+
 #: 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 "Celočíselná hodnota"
+msgstr "Integer"
 
 #: contrib/admin/views/doc.py:263
 msgid "Boolean (Either True or False)"
-msgstr "Logická hodnota (buď True alebo False)"
+msgstr "Boolean (Buď True alebo False)"
 
 #: contrib/admin/views/doc.py:264
 #, python-format
 msgid "String (up to %(maxlength)s)"
-msgstr "Reťazec (maximálne do %(maxlength)s)"
+msgstr "Reťazec (maximálne do  %(maxlength)s)"
 
 #: contrib/admin/views/doc.py:265
 msgid "Comma-separated integers"
-msgstr "Čiarka oddeľuje celé čísla"
+msgstr "Celé čísla oddelené čiarkami"
 
 #: contrib/admin/views/doc.py:266
 msgid "Date (without time)"
@@ -422,7 +555,7 @@ msgstr "Dátum (bez času)"
 
 #: contrib/admin/views/doc.py:267
 msgid "Date (with time)"
-msgstr "Dátum ( a čas)"
+msgstr "Dátum (a čas)"
 
 #: contrib/admin/views/doc.py:268
 msgid "E-mail address"
@@ -438,7 +571,7 @@ msgstr "Desiatkové číslo"
 
 #: contrib/admin/views/doc.py:276
 msgid "Boolean (Either True, False or None)"
-msgstr "Logická hodnota (buď True, False alebo None)"
+msgstr "Boolean (Možné hodnoty sú True, False alebo None)"
 
 #: contrib/admin/views/doc.py:277
 msgid "Phone number"
@@ -446,7 +579,7 @@ msgstr "Číslo telefónu"
 
 #: contrib/admin/views/doc.py:280
 msgid "String (up to 50)"
-msgstr "Reťazec (do 50 )"
+msgstr "Reťazec (maximálne do 50 znakov)"
 
 #: contrib/admin/views/doc.py:282
 msgid "Text"
@@ -458,24 +591,78 @@ msgstr "Čas"
 
 #: contrib/admin/views/doc.py:285
 msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. štát (dve veľké písmena)"
+msgstr "U.S. štát (dve veľké písmená)"
 
 #: contrib/admin/views/doc.py:286
 msgid "XML text"
 msgstr "XML text"
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Začiatok"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Pridaj %(name)s"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Pridaj"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Zmeň"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nemáte povolenie na zmeny ."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Posledné udalosti"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Moje udalosti"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nepovolené"
+
+#: 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"
 msgstr "História"
 
@@ -509,64 +696,11 @@ msgstr "Django web admin"
 
 #: contrib/admin/templates/admin/base_site.html:7
 msgid "Django administration"
-msgstr "Administrácia Django"
-
-#: 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/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Stránka nebola nájdená"
-
-#: 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
-msgid "Add"
-msgstr "Pridaj"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Zmeň"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Nemáte povolenie na zmeny ."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Posledné udalosti"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Moje udalosti"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nepovolené"
+msgstr "Spravované Djangom"
 
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
-msgstr "Meno:"
+msgstr "Meno užívateľa:"
 
 #: contrib/admin/templates/admin/login.html:18
 msgid "Password:"
@@ -576,21 +710,37 @@ 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/login.html:24
-msgid "Log in"
-msgstr "Prihlásenie"
+#: 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/base.html:23
-msgid "Welcome,"
-msgstr "Vítajte,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Zmena hesla"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Pozri tu"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odhlásenie"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Prosím opravte chybu, je nižšie"
+msgstr[1] "Prosím opravte chyby, sú nižšie"
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Objednávanie"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Objednávka:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -616,6 +766,44 @@ msgstr ""
 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 "Vymazať"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Uložiť ako nový"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Uložiť a pridať ďalší"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Uložiť a pokračovať editovať"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "Uložiť"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr "Podľa %(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
@@ -730,6 +918,157 @@ msgstr "Ďakujeme, že používate naše stránky!"
 msgid "The %(site_name)s team"
 msgstr "Skupina %(site_name)s"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "Dokumentácia"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Záložky"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "Záložky dokumentácie"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Na inštaláciu zarážok, chyťte a potiahnite linku do vášho "
+"bookmarks\n"
+"toolbar, alebo klik pravou myšou na linku a pridať do vášho  bookmarks.\n"
+" Teraz si môžete vyberať zarážky z ľubovoľnej stránky webu.\n"
+"Poznámka: pri tvorbe niektorých zarážok, sa vyžaduje aby ste sa pohybovali\n"
+"po stránke z počítača označeného ako \"internal\" (obrátte sa na vášho \n"
+"systémového administrátora, ak nie ste si istý či váš počítač je \"internal"
+"\").</p>\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Dokumentácia  tejto stránky"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr "Skoč na ľubovoľnú stránku dokumentácie, z ponuky na tejto stránke."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "Ukáž objekt id"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Ukáž  content-type a jedinečné  ID pre stránky reprezentované jednoduchými "
+"objektami."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "Edituj tento objekt (aktuálne okno)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "Skoč na admin stránku z jednoduchých objektov zastupujúcich stránku."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "Edituj tento objekt (nové okno)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr "Ako hore, ale otvorí admin stránku v novom okne"
+
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "presmerovaný z"
+
+#: 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"
@@ -847,22 +1186,24 @@ msgid "Dec."
 msgstr "Dec."
 
 #: utils/timesince.py:12
+#, fuzzy
 msgid "year"
 msgid_plural "years"
-msgstr[0] "rok"
-msgstr[1] "rokov"
+msgstr[0] "Tento rok"
+msgstr[1] "Tento rok"
 
 #: utils/timesince.py:13
+#, fuzzy
 msgid "month"
 msgid_plural "months"
-msgstr[0] "mesiac"
-msgstr[1] "mesiacov"
+msgstr[0] "Tento mesiac"
+msgstr[1] "Tento mesiac"
 
 #: utils/timesince.py:14
 msgid "day"
 msgid_plural "days"
-msgstr[0] "ďeň"
-msgstr[1] "dní"
+msgstr[0] "Dnes"
+msgstr[1] "Dnes"
 
 #: utils/timesince.py:15
 msgid "hour"
@@ -981,8 +1322,8 @@ msgid "password"
 msgstr "heslo"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]'"
-msgstr "Použi '[algo]$[salt]$[hexdigest]'"
+msgid "Use '[algo]$[salt]$[hexdigest]"
+msgstr ""
 
 #: models/auth.py:38
 msgid "staff status"
@@ -1108,6 +1449,48 @@ msgstr "Švédsky"
 msgid "Simplified Chinese"
 msgstr "Zjednodušená činština "
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "Toto pole nie je platné."
+
+#: core/formfields.py:339
+#, fuzzy, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Uistite sa, že text je kratší ako %s znakov."
+msgstr[1] "Uistite sa, že text je kratší ako %s znakov."
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "Malé písmena tu nie sú povolené."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Určená platná voľba; '%(data)s' sa nenachádza v %(choices)s."
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr "Poslaný súbor je prázdny."
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Vložte celé číslo s hodnotou medzi -32,768 a 32,767."
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Vložte celé kladné číslo."
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Vložte celé číslo s hodnotou medzi 0 a 32,767."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Toto môže obsahovať len písmená, číslice a podčiarkovníky."
@@ -1373,13 +1756,40 @@ msgstr ""
 "Atribút \"%(attr)s\" na riadku %(line)s má neplatnú hodnotu. (Riadok začína "
 "s \"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Prosím vložte platné %s."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "%(optname)s s týmto %(fieldname)s už existuje."
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr "Identifikátory oddeľte  čiarkami."
 
-#: 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 ""
 " Podržte \"Control\", alebo \"Command\" na  Mac_u, na výber viac ako jednej "
 "položky."
+
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Vložte platné meno súboru."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] "Prosím vložte platné %(self)s IDs. Hodnota %(value)r je chybná"
+msgstr[1] "Prosím vložte platné %(self)s IDs. Hodnoty %(value)r sú chybné"
+
+#~ msgid "Use an MD5 hash -- not the raw password."
+#~ msgstr ""
+#~ "Vložte takú hodnotu hesla , ako vám ju vráti MD5, nevkladajte ho priamo. "
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index f1943fa871..c577f4918a 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 2b729e0597..1d9cb0a81e 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Serbian (latin) translation v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-23 11:34-0600\n"
-"PO-Revision-Date: 2005-11-13 19:21+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
+"PO-Revision-Date: 2005-11-20 19:07+0100\n"
 "Last-Translator: Nebojša Đorđević <nesh@studioquattro.co.yu>\n"
 "Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail."
 "com>\n"
@@ -19,95 +19,92 @@ msgstr ""
 
 #: contrib/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
-#, fuzzy
 msgid "object ID"
 msgstr "id objekta"
 
 #: contrib/comments/models/comments.py:9
 msgid "headline"
-msgstr ""
+msgstr "naslov"
 
 #: contrib/comments/models/comments.py:10
 #: contrib/comments/models/comments.py:162
-#, fuzzy
 msgid "comment"
-msgstr "sadržaj"
+msgstr "komentar"
 
 #: contrib/comments/models/comments.py:11
 msgid "rating #1"
-msgstr ""
+msgstr "rejting #1"
 
 #: contrib/comments/models/comments.py:12
 msgid "rating #2"
-msgstr ""
+msgstr "rejting #2"
 
 #: contrib/comments/models/comments.py:13
 msgid "rating #3"
-msgstr ""
+msgstr "rejting #3"
 
 #: contrib/comments/models/comments.py:14
 msgid "rating #4"
-msgstr ""
+msgstr "rejting #4"
 
 #: contrib/comments/models/comments.py:15
 msgid "rating #5"
-msgstr ""
+msgstr "rejting #5"
 
 #: contrib/comments/models/comments.py:16
 msgid "rating #6"
-msgstr ""
+msgstr "rejting #6"
 
 #: contrib/comments/models/comments.py:17
 msgid "rating #7"
-msgstr ""
+msgstr "rejting #7"
 
 #: contrib/comments/models/comments.py:18
 msgid "rating #8"
-msgstr ""
+msgstr "rejting #8"
 
 #: contrib/comments/models/comments.py:23
 msgid "is valid rating"
-msgstr ""
+msgstr "da li je rejting validan"
 
 #: contrib/comments/models/comments.py:24
 #: contrib/comments/models/comments.py:164
 msgid "date/time submitted"
-msgstr ""
+msgstr "datum/vreme slanja"
 
 #: contrib/comments/models/comments.py:25
 #: contrib/comments/models/comments.py:165
 msgid "is public"
-msgstr ""
+msgstr "da li je javni"
 
 #: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
-#, fuzzy
 msgid "IP address"
-msgstr "e-mail adresa"
+msgstr "IP adresa"
 
 #: contrib/comments/models/comments.py:27
 msgid "is removed"
-msgstr ""
+msgstr "obrisan je"
 
 #: contrib/comments/models/comments.py:27
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
+"Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je "
+"obrisan\" umesto teksta komentara."
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
-msgstr ""
+msgstr "Komentar"
 
 #: contrib/comments/models/comments.py:32
-#, fuzzy
 msgid "Comments"
-msgstr "omogućite komentare"
+msgstr "Komentari"
 
 #: contrib/comments/models/comments.py:85
 #: contrib/comments/models/comments.py:204
-#, fuzzy
 msgid "Content object"
-msgstr "tip sadržaja"
+msgstr "Objekt sa sadržajem"
 
 #: contrib/comments/models/comments.py:113
 #, python-format
@@ -118,72 +115,69 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
+"Poslao %(user)s u %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 
 #: contrib/comments/models/comments.py:163
-#, fuzzy
 msgid "person's name"
 msgstr "ime"
 
 #: contrib/comments/models/comments.py:166
-#, fuzzy
 msgid "ip address"
-msgstr "e-mail adresa"
+msgstr "ip adresa"
 
 #: contrib/comments/models/comments.py:168
 msgid "approved by staff"
-msgstr ""
+msgstr "odobreno od moderatora"
 
 #: contrib/comments/models/comments.py:172
-#, fuzzy
 msgid "Free comment"
-msgstr "omogućite komentare"
+msgstr "Slobodan komentar"
 
 #: contrib/comments/models/comments.py:173
-#, fuzzy
 msgid "Free comments"
-msgstr "omogućite komentare"
+msgstr "Slobodni komentari"
 
 #: contrib/comments/models/comments.py:209
 msgid "score"
-msgstr ""
+msgstr "rezultat"
 
 #: contrib/comments/models/comments.py:210
-#, fuzzy
 msgid "score date"
-msgstr "datum prestanka važenja sesije"
+msgstr "datum rezultata"
 
 #: contrib/comments/models/comments.py:213
 msgid "Karma score"
-msgstr ""
+msgstr "\"Karma\" rezultat"
 
 #: contrib/comments/models/comments.py:214
 msgid "Karma scores"
-msgstr ""
+msgstr "\"Karma\" rezultati"
 
 #: contrib/comments/models/comments.py:223
 #, python-format
 msgid "%(score)d rating by %(user)s"
-msgstr ""
+msgstr "Rezultat %(score)d od %(user)s"
 
 #: contrib/comments/models/comments.py:248
-#, fuzzy
 msgid "flag date"
-msgstr "statična strana"
+msgstr "datum markiranja"
 
 #: contrib/comments/models/comments.py:251
-#, fuzzy
 msgid "User flag"
-msgstr "Korisnik"
+msgstr "Korisnički marker"
 
 #: contrib/comments/models/comments.py:252
-#, fuzzy
 msgid "User flags"
-msgstr "Korisnici"
+msgstr "Korisnički markeri"
 
 #: contrib/comments/models/comments.py:256
 #, python-format
 msgid "Flag by %r"
-msgstr ""
+msgstr "%r je markirao"
 
 #: contrib/comments/models/comments.py:271
 #, python-format
@@ -192,42 +186,44 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
+"Ovaj komentar je markiran od %(user)s:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/models/comments.py:278
-#, fuzzy
 msgid "deletion date"
-msgstr "podaci sesije"
+msgstr "datum brisanja"
 
 #: contrib/comments/models/comments.py:281
 msgid "Moderator deletion"
-msgstr ""
+msgstr "Brisanje od strane moderatora"
 
 #: contrib/comments/models/comments.py:282
 msgid "Moderator deletions"
-msgstr ""
+msgstr "Brisanja od strane moderatora"
 
 #: contrib/comments/models/comments.py:286
 #, python-format
 msgid "Moderator deletion by %r"
-msgstr ""
+msgstr "Obrisao moderator %r"
 
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
-msgstr ""
+msgstr "Anonimni korisnici ne mogu da glasaju"
 
 #: contrib/comments/views/karma.py:22
-#, fuzzy
 msgid "Invalid comment ID"
-msgstr "omogućite komentare"
+msgstr "Neispravan ID komentara"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
-msgstr ""
+msgstr "Ne možete da glasate sami za sebe"
 
+# nesh: grrrrr, ala je rogobatno
 #: contrib/comments/views/comments.py:25
 msgid ""
 "This rating is required because you've entered at least one other rating."
-msgstr ""
+msgstr "Ovaj rejting je obavezan pošto ste uneli još najmanje jedan rejting."
 
 #: contrib/comments/views/comments.py:109
 #, python-format
@@ -242,9 +238,22 @@ msgid_plural ""
 "\n"
 "%(text)s"
 msgstr[0] ""
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
+"\n"
+"%(text)s"
 msgstr[1] ""
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
+"\n"
+"%(text)s"
 msgstr[2] ""
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
+"\n"
+"%(text)s"
 
+# nesh: skethcy???
 #: contrib/comments/views/comments.py:114
 #, python-format
 msgid ""
@@ -252,21 +261,24 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
+"Ovaj komentar je poslat od \"sketcy\" korisnika:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/views/comments.py:186
 #: contrib/comments/views/comments.py:277
 msgid "Only POSTs are allowed"
-msgstr ""
+msgstr "Jedino je POST dozvoljen"
 
 #: contrib/comments/views/comments.py:190
 #: contrib/comments/views/comments.py:281
 msgid "One or more of the required fields wasn't submitted"
-msgstr ""
+msgstr "Jedno ili više obaveznih polja nije poslato."
 
 #: contrib/comments/views/comments.py:194
 #: contrib/comments/views/comments.py:283
 msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
+msgstr "Neko je menjao form za komentare (povreda sigurnosti)"
 
 #: contrib/comments/views/comments.py:204
 #: contrib/comments/views/comments.py:289
@@ -274,15 +286,62 @@ msgid ""
 "The comment form had an invalid 'target' parameter -- the object ID was "
 "invalid"
 msgstr ""
+"Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan"
 
 #: contrib/comments/views/comments.py:254
 #: contrib/comments/views/comments.py:318
 msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "Ovaj komentar nije koristio 'preview' ili 'post'"
+
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
 msgstr ""
+"<h3>Od %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr "Sve"
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr "Bilo koji datum"
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr "Danas"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr "Zadnjih sedam dana"
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr "Ovaj mesec"
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr "Ova godina"
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr "Da"
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr "Ne"
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr "Nepoznato"
 
 #: contrib/admin/models/admin.py:6
 msgid "action time"
-msgstr "Datum/vreme akcije"
+msgstr "vreme akcije"
 
 #: contrib/admin/models/admin.py:9
 msgid "object id"
@@ -308,96 +367,276 @@ msgstr "unos u dnevnik izmena"
 msgid "log entries"
 msgstr "unosi u dnevnik izmena"
 
+#: contrib/admin/templatetags/admin_list.py:244
+msgid "All dates"
+msgstr "Svi datumi"
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Prijavi se"
+
+#: 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 ""
+"Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su "
+"sačuvani."
+
+#: 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 ""
+"Izgleda da vaš browser ne podržava \"cookie\". Uključite ih, ponovo učitajte "
+"stranu i pokušajte ponovo."
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr "Korisnička imena ne mogu sadržati karakter '@'."
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Vaša e-mail adresa nije koriničko ime. Probajte sa '%s'."
+
+#: contrib/admin/views/main.py:50
+msgid "Site administration"
+msgstr "Administracija sajta"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr "Izaberi %s"
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr "Izaberi %s za izmenu"
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Uspešno dodat %(name)s \"%(obj)s\"."
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr "Ispod ga možete ponovo izmeniti."
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr "Ispod možete dodati još jedan %s."
+
+#: contrib/admin/views/main.py:451
+#, python-format
+msgid "Add %s"
+msgstr "Dodaj %s"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr "Dodat %s"
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr "i"
+
+#: contrib/admin/views/main.py:469
+#, python-format
+msgid "Changed %s."
+msgstr "Izmenjen %s."
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr "Obrisan %s"
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr "Nijedno polje nije promenjeno."
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Uspešno izmenjen: %(name)s \"%(obj)s\"."
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" je uspešno dodat. Ispod ga možete ponovo menjati."
+
+#: contrib/admin/views/main.py:546
+#, python-format
+msgid "Change %s"
+msgstr "Izmeni %s"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Jedno ili više %(fieldname)s u %(name)s: %(obj)s"
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Jedan ili više %(fieldname)s u %(name)s:"
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Uspešno obrisan: %(name)s \"%(obj)s\"."
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr "Da li ste sigurni?"
+
+#: contrib/admin/views/main.py:678
+#, python-format
+msgid "Change history: %s"
+msgstr "Istorija izmena: %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
 msgid "Integer"
-msgstr ""
+msgstr "Ceo broj"
 
 #: contrib/admin/views/doc.py:263
 msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Logička vrednost (Tačno ili Netačno)"
 
 #: contrib/admin/views/doc.py:264
 #, python-format
 msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr "Niz karaktera (maksimalno %(maxlength)s karaktera)"
 
 #: contrib/admin/views/doc.py:265
 msgid "Comma-separated integers"
-msgstr ""
+msgstr "Brojevi razdvojeni zarezima"
 
 #: contrib/admin/views/doc.py:266
-#, fuzzy
 msgid "Date (without time)"
-msgstr "Datum/vreme akcije"
+msgstr "Datum (bez vremena)"
 
 #: contrib/admin/views/doc.py:267
-#, fuzzy
 msgid "Date (with time)"
-msgstr "Datum/vreme"
+msgstr "Datum (sa vremenom)"
 
 #: contrib/admin/views/doc.py:268
-#, fuzzy
 msgid "E-mail address"
-msgstr "E-mail adresa:"
+msgstr "E-mail adresa"
 
 #: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
 msgid "File path"
-msgstr ""
+msgstr "Putanja do fajla"
 
 #: contrib/admin/views/doc.py:270
-#, fuzzy
 msgid "Decimal number"
-msgstr "Decembar"
+msgstr "Decimalni broj"
 
 #: contrib/admin/views/doc.py:276
 msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Logička vrednost (Tačno, Netačno ili prazno)"
 
 #: contrib/admin/views/doc.py:277
-#, fuzzy
 msgid "Phone number"
-msgstr "Unesite celi broj."
+msgstr "Telefonski broj"
 
 #: contrib/admin/views/doc.py:280
 msgid "String (up to 50)"
-msgstr ""
+msgstr "Niz karaktera (maksimalno 50 karaktera)"
 
 #: contrib/admin/views/doc.py:282
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #: contrib/admin/views/doc.py:283
 msgid "Time"
-msgstr ""
+msgstr "Vreme"
 
 # nesh: ovo se valjda ne prevodi
 # petar: ne prevodi se
 #: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: contrib/admin/views/doc.py:285
 msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr "U.S. država (dva VELIKA slova)"
 
 #: contrib/admin/views/doc.py:286
 msgid "XML text"
-msgstr ""
+msgstr "XML tekst"
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Početna strana"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Dodaj %(name)s"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Dodaj"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Izmena"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nemate prava da vršite izmene."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Skorije akcije"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Moje akcije"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nema dostupnih"
+
+#: 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"
 msgstr "Istorija"
 
@@ -433,59 +672,6 @@ msgstr "Django administracija sajta"
 msgid "Django administration"
 msgstr "Django administracija"
 
-#: 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/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/index.html:27
-msgid "Add"
-msgstr "Dodaj"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Izmena"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Nemate prava da vršite izmene."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Skorije akcije"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Moje akcije"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nema dostupnih"
-
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Korisničko ime:"
@@ -498,21 +684,33 @@ 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/login.html:24
-msgid "Log in"
-msgstr "Prijavi se"
+#: 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 "Welcome,"
-msgstr "Dobrodošli,"
+#: 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/base.html:23
-msgid "Change password"
-msgstr "Izmeni lozinku"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Pogledaj na sajtu"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odjavi se"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Ispravite dole navedenu grešku."
+msgstr[1] "Ispravite dole navedene greške."
+msgstr[2] "Ispravite dole navedene greške."
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Redosled"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Red:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -537,6 +735,43 @@ msgstr ""
 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 "Obriši"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Snimi kao novi"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Snimi i dodaj još jedan"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Snimi i nastavi sa izmenama"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Snimi"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr "Po %(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
@@ -651,6 +886,76 @@ msgstr "Hvala Vam na poseti!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s tim"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "Dokumentacioni \"bookmarklets\""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Da bi ste instalirali \"bookmarklet\", odvučite link u "
+"vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete "
+"da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup "
+"nekima od strana mora biti sa kompjutera čija je IP adresa označena kao "
+"\"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je "
+"vaš IP označen kao \"internal\").</p>\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Dokumentacija za ovu stranu"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji "
+"generiše tu stranu."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "Prikaži ID objekta"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan "
+"objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "Izmena objekta (u aktivnom prozoru)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "Skače na admin stranu za strane koje predstavljaju objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "Izmeni objekt (novi prozor)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr "Kao iznad, samo otvara admin stranu u novom prozoru."
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "redirekcija od"
@@ -711,8 +1016,8 @@ 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'."
+"Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti "
+"flatpages/default'."
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "registration required"
@@ -903,7 +1208,7 @@ msgstr "sajtovi"
 
 #: models/core.py:28
 msgid "label"
-msgstr ""
+msgstr "labela"
 
 #: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
 msgid "name"
@@ -911,11 +1216,11 @@ msgstr "ime"
 
 #: models/core.py:31
 msgid "package"
-msgstr ""
+msgstr "paket"
 
 #: models/core.py:32
 msgid "packages"
-msgstr ""
+msgstr "paketi"
 
 #: models/core.py:42
 msgid "python module name"
@@ -951,7 +1256,7 @@ msgstr "sesije"
 
 #: models/auth.py:8
 msgid "codename"
-msgstr ""
+msgstr "kodno ime"
 
 #: models/auth.py:10
 msgid "Permission"
@@ -1040,83 +1345,120 @@ msgstr "Važni datumi"
 msgid "Message"
 msgstr "Poruka"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 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
-#, fuzzy
-msgid "Danish"
-msgstr "Španski"
-
 #: conf/global_settings.py:40
+msgid "Danish"
+msgstr "Danski"
+
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Nemački"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Engleski"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Španski"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Francuski"
 
-#: conf/global_settings.py:44
-msgid "Galician"
-msgstr ""
-
 #: conf/global_settings.py:45
-msgid "Icelandic"
-msgstr ""
+msgid "Galician"
+msgstr "Galski"
 
 #: conf/global_settings.py:46
+msgid "Icelandic"
+msgstr "Islandski"
+
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "Italijanski"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Brazilski"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr "Rumunski"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Ruski"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr "Slovački"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr "Srpski"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr "Švedski"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "Kineski (pojednostavljen)"
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+msgid "This field is required."
+msgstr "Obavezno polje."
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Tekst mora imati manje od %s karaktera."
+msgstr[1] "Tekst mora imati manje od %s karaktera."
+msgstr[2] "Tekst mora imati manje od %s karaktera."
+
+#: core/formfields.py:344
+msgid "Line breaks are not allowed here."
+msgstr "Novi redovi ovde nisu dozvoljeni."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Izaberite validnu opciju: '%(data)s' nije u %(choices)s."
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr "Poslati fajl je prazan."
+
+#: core/formfields.py:659
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Unesite celi broj između -32,768 i 32,767."
+
+#: core/formfields.py:668
+msgid "Enter a positive number."
+msgstr "Unesite pozitivan broj."
+
+#: core/formfields.py:677
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Unesite celi broj između 0 i 32,767."
+
 # nesh: Ovo je opis za stari SlugField
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
@@ -1201,6 +1543,7 @@ msgstr "URL %s ne pokazuje na ispravnu sliku"
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr ""
+"Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan."
 
 #: core/validators.py:169
 #, python-format
@@ -1238,7 +1581,7 @@ msgstr "URL %s je neispravan link."
 # nesh: Ni ovo nije interesantno za i18n
 #: core/validators.py:216
 msgid "Enter a valid U.S. state abbreviation."
-msgstr ""
+msgstr "Unesite ispravnu skraćenicu za U.S. državu."
 
 #: core/validators.py:231
 #, python-format
@@ -1385,16 +1728,50 @@ msgstr ""
 "Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje "
 "sa \"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Unesite ispravan %s."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "%(optname)s sa ovim %(fieldname)s već postoji."
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " Odvojite višestruke ID-ove zarezima."
 
-#: 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 ""
 " Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više "
 "stavki."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Unesite MD5 hash šifre -- ne unosite sam tekst šifre."
+#: core/meta/fields.py:511
+msgid "Enter a valid filename."
+msgstr "Unesite ispravno ime fajla."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
+msgstr[1] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
+msgstr[2] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
+
+#~ msgid "Error in Template"
+#~ msgstr "Greška u templejtu"
+
+#~ msgid ""
+#~ "\n"
+#~ "In template %(name)s, error at line %(line)s:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "U templejtu %(name)s, greška u redu %(line)s:\n"
+
+#, fuzzy
+#~ msgid "count"
+#~ msgstr "sadržaj"
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index 14f4211804..3a9be99f22 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 fa0fde66c5..ae3c42826b 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-23 11:35-0600\n"
+"POT-Creation-Date: 2005-11-23 00:06+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"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "måndag"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "nov"
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "tid för händelse"
@@ -306,6 +352,134 @@ msgstr "loggpost"
 msgid "log entries"
 msgstr "loggpost"
 
+#: contrib/admin/templatetags/admin_list.py:244
+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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administration för Django"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Lägg till"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Ändra"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Ändra"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -382,18 +556,72 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "Hem"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Lägg till"
+
+#: 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
+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"
 
@@ -429,59 +657,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:"
@@ -494,21 +669,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
@@ -534,6 +720,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
@@ -650,6 +874,66 @@ msgstr "Tack för att du använder vår sida!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s-laget"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "objektets id"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "vidarebefodra från"
@@ -1034,83 +1318,125 @@ msgstr "Viktiga datum"
 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
 #, fuzzy
 msgid "Danish"
 msgstr "Spanska"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Tyska"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "Engelska"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "Spanska"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "Franska"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "Galisiska"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "Italienska"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr "Norska"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "Brasilianska"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Romanian"
 msgstr "Rumänska"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "Ryska"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Slovak"
 msgstr "Slovakiska"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr "Serbiska"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "Förenklad kinesiska"
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "Det här fältet är ogiltigt."
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "Små bokstäver är inte tillåtna här."
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Fyll i ett heltal."
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Fyll i ett heltal."
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Fyll i ett heltal."
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Det här värdet får bara innehålla bokstäver, tal och understräck."
@@ -1377,15 +1703,39 @@ 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:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Var god fyll i ett giltigt IP-nummer."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: 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 ""
 " Håll ner \"Control\", eller \"Command\" på en Mac, för att välja mer än en."
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "Använd en MD5-hash -- inte lösenordet i ren text."
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Fyll i en giltig e-postadress."
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "count"
+#~ msgstr "innehåll"
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 70e29ea3ba..669bc72cea 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 0ce4c6d4cf..fd108e2492 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-23 11:34-0600\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-11-16 12:55+0800\n"
 "Last-Translator: limodou <limodou@gmail.com>\n"
 "Language-Team: Simplified Chinese <limodou@gmail.com>\n"
@@ -280,6 +280,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "星期一"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "十一月"
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "动作时间"
@@ -308,6 +354,134 @@ msgstr "日志记录"
 msgid "log entries"
 msgstr "日志记录"
 
+#: contrib/admin/templatetags/admin_list.py:244
+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:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Django管理员"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:421
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:451
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "增加"
+
+#: contrib/admin/views/main.py:467
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:469
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "修改"
+
+#: contrib/admin/views/main.py:471
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:474
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:499
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:546
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "修改"
+
+#: contrib/admin/views/main.py:626
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:631
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:660
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:663
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:678
+#, 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
@@ -384,18 +558,72 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:5
 #: 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
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Home"
 msgstr "首页"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+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
+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"
 msgstr "历史"
 
@@ -429,59 +657,6 @@ msgstr "Django管理站点"
 msgid "Django administration"
 msgstr "Django管理员"
 
-#: 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/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 "用户名："
@@ -494,21 +669,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
@@ -532,6 +718,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
@@ -645,6 +869,66 @@ msgstr "感谢使用我们的站点！"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s 小组"
 
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "对象id"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "重定向自"
@@ -1015,82 +1299,123 @@ msgstr "重要日期"
 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 "Danish"
 msgstr "丹麦语"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "德语"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "English"
 msgstr "英语"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "French"
 msgstr "法语"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Galician"
 msgstr "加利西亚语"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Icelandic"
 msgstr "冰岛语"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Italian"
 msgstr "意大利语"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Brazilian"
 msgstr "巴西语"
 
-#: conf/global_settings.py:49
-msgid "Romanian"
-msgstr "罗马尼亚语"
-
 #: conf/global_settings.py:50
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:51
 msgid "Russian"
 msgstr "俄语"
 
-#: conf/global_settings.py:51
-msgid "Slovak"
-msgstr "斯洛伐克语"
-
 #: conf/global_settings.py:52
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
+#, fuzzy
+msgid "This field is required."
+msgstr "这个字段无效。"
+
+#: core/formfields.py:339
+#, python-format
+msgid "Ensure your text is less than %s character"
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+
+#: core/formfields.py:344
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "这里不允许小写字母。"
+
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:605
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:659
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "输入整数。"
+
+#: core/formfields.py:668
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "输入整数。"
+
+#: core/formfields.py:677
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "输入整数。"
+
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "此值只能包含字母、数字和下划线。"
@@ -1341,14 +1666,37 @@ msgid ""
 msgstr ""
 "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "请输入一个有效的IP地址。"
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " 用逗号分隔多个ID。"
 
-#: 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 " 按下 \"Control\"，或者在Mac上按 \"Command\" 来选择一个或多个值。"
 
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr "使用MD5的哈希值 -- 不是原始的口令。"
+#: core/meta/fields.py:511
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "输入一个有效的邮件地址。"
+
+#: core/meta/fields.py:780
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] ""
+
+#, fuzzy
+#~ msgid "count"
+#~ msgstr "内容"