diff --git a/AUTHORS b/AUTHORS
index 2dd8a87b79..49a863cbd0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -440,6 +440,7 @@ answer newbie questions, and generally made Django that much better:
     viestards.lists@gmail.com
     George Vilches <gav@thataddress.com>
     Vlado <vlado@labath.org>
+    Zachary Voase <zacharyvoase@gmail.com>
     Milton Waddams
     Chris Wagner <cw264701@ohio.edu>
     Rick Wagner <rwagner@physics.ucsd.edu>
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 1de523dd36..67d6facc42 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 f1f6c9734f..51918c82ec 100644
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 20:27+0100\n"
+"POT-Creation-Date: 2009-07-26 21:43+0200\n"
 "PO-Revision-Date: 2008-11-07 20:41+0200\n"
 "Last-Translator: Finn Gruwier Larsen<finn@gruwier.dk>\n"
 "Language-Team: \n"
@@ -218,6 +218,20 @@ msgstr "Forenklet kinesisk"
 msgid "Traditional Chinese"
 msgstr "Traditionelt kinesisk"
 
+#: contrib/admin/actions.py:60
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr "%(count)d %(items)s blev slettet."
+
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+
+#: contrib/admin/actions.py:85
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr "Slet valgte %(verbose_name_plural)s"
+
 #: contrib/admin/filterspecs.py:44
 #, python-format
 msgid ""
@@ -227,43 +241,47 @@ msgstr ""
 "<h3>Efter %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91
-#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172
+#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
 msgid "All"
 msgstr "Alle"
 
-#: contrib/admin/filterspecs.py:112
+#: contrib/admin/filterspecs.py:113
 msgid "Any date"
 msgstr "Når som helst"
 
-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:114
 msgid "Today"
 msgstr "I dag"
 
-#: contrib/admin/filterspecs.py:116
+#: contrib/admin/filterspecs.py:117
 msgid "Past 7 days"
 msgstr "De sidste 7 dage"
 
-#: contrib/admin/filterspecs.py:118
+#: contrib/admin/filterspecs.py:119
 msgid "This month"
 msgstr "Denne måned"
 
-#: contrib/admin/filterspecs.py:120
+#: contrib/admin/filterspecs.py:121
 msgid "This year"
 msgstr "Dette år"
 
-#: contrib/admin/filterspecs.py:146 forms/widgets.py:390
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
 msgid "Yes"
 msgstr "Ja"
 
-#: contrib/admin/filterspecs.py:146 forms/widgets.py:390
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
 msgid "No"
 msgstr "Nej"
 
-#: contrib/admin/filterspecs.py:153 forms/widgets.py:390
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
 msgid "Unknown"
 msgstr "Ukendt"
 
+#: contrib/admin/helpers.py:14
+msgid "Action:"
+msgstr "Handling"
+
 #: contrib/admin/models.py:19
 msgid "action time"
 msgstr "handlingstid"
@@ -292,99 +310,103 @@ msgstr "logmeddelelse"
 msgid "log entries"
 msgstr "logmeddelelser"
 
-#: contrib/admin/options.py:60 contrib/admin/options.py:121
+#: contrib/admin/options.py:133 contrib/admin/options.py:147
 msgid "None"
 msgstr "Ingen"
 
-#: contrib/admin/options.py:338
+#: contrib/admin/options.py:519
 #, python-format
 msgid "Changed %s."
 msgstr "Ændrede %s."
 
-#: contrib/admin/options.py:338 contrib/admin/options.py:348
-#: contrib/comments/templates/comments/preview.html:15 forms/models.py:288
+#: contrib/admin/options.py:519 contrib/admin/options.py:529
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
+#: forms/models.py:600
 msgid "and"
 msgstr "og"
 
-#: contrib/admin/options.py:343
+#: contrib/admin/options.py:524
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Tilføjede %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:347
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Ændrede %(list)s for %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:352
+#: contrib/admin/options.py:533
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Slettede %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:356
+#: contrib/admin/options.py:537
 msgid "No fields changed."
 msgstr "Ingen felter ændret."
 
-#: contrib/admin/options.py:417 contrib/auth/admin.py:51
+#: contrib/admin/options.py:599 contrib/auth/admin.py:67
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" blev tilføjet i databasen."
 
-#: contrib/admin/options.py:421 contrib/admin/options.py:454
-#: contrib/auth/admin.py:59
+#: contrib/admin/options.py:603 contrib/admin/options.py:636
+#: contrib/auth/admin.py:75
 msgid "You may edit it again below."
 msgstr "Du kan redigere det igen herunder."
 
-#: contrib/admin/options.py:431 contrib/admin/options.py:464
+#: contrib/admin/options.py:613 contrib/admin/options.py:646
 #, python-format
 msgid "You may add another %s below."
 msgstr "Du kan tilføje endnu en %s herunder."
 
-#: contrib/admin/options.py:452
+#: contrib/admin/options.py:634
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" blev ændret."
 
-#: contrib/admin/options.py:460
+#: contrib/admin/options.py:642
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" blev tilføjet. Du kan redigere det igen herunder."
 
-#: contrib/admin/options.py:528
+#: contrib/admin/options.py:773
 #, python-format
 msgid "Add %s"
 msgstr "Tilføj %s"
 
-#: contrib/admin/options.py:559 contrib/admin/options.py:673
+#: contrib/admin/options.py:804 contrib/admin/options.py:1005
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Der findes ikke et %(name)s-objekt med primærnøgle %(key)r."
 
-#: contrib/admin/options.py:606
+#: contrib/admin/options.py:861
 #, python-format
 msgid "Change %s"
 msgstr "Ret %s"
 
-#: contrib/admin/options.py:638
+#: contrib/admin/options.py:905
 msgid "Database error"
 msgstr "databasefejl"
 
-#: contrib/admin/options.py:688
+#: contrib/admin/options.py:941
+#,  python-format
+msgid "%(count)s %(name)s was changed successfully."
+msgid_plural "%(count)s %(name)s were changed successfully."
+msgstr[0] "%(count)s %(name)s blev ændret."
+msgstr[1] "%(count)s %(name)s blev ændret."
+
+#: contrib/admin/options.py:1020
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" blev slettet."
 
-#: contrib/admin/options.py:695
-msgid "Are you sure?"
-msgstr "Er du sikker?"
-
-#: contrib/admin/options.py:724
+#: contrib/admin/options.py:1057
 #, python-format
 msgid "Change history: %s"
 msgstr "Ændringshistorik: %s"
 
-#: contrib/admin/sites.py:16 contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
 #: contrib/auth/forms.py:80
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
@@ -393,11 +415,11 @@ msgstr ""
 "Indtast venligst et korrekt brugernavn og adgangskode. Bemærk, at begge "
 "felter er versalfølsomme."
 
-#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Log venligst ind igen, da din session er udløbet."
 
-#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -405,62 +427,62 @@ msgstr ""
 "Det ser ud til din browser ikke er indstillet til at acceptere cookies. Slå "
 "venligst cookies til, genindlæs denne side og prøv igen."
 
-#: contrib/admin/sites.py:249 contrib/admin/sites.py:255
+#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Brugernavne kan ikke indeholde tegnet '@'."
 
-#: contrib/admin/sites.py:252 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Din e-mail-adresse er ikke dit brugernavn. Prøv '%s' i stedet."
 
-#: contrib/admin/sites.py:312
+#: contrib/admin/sites.py:367
 msgid "Site administration"
 msgstr "Website-administration"
 
-#: contrib/admin/sites.py:325 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "Log ind"
 
-#: contrib/admin/sites.py:372
+#: contrib/admin/sites.py:426
 #, python-format
 msgid "%s administration"
 msgstr "Administration af %s"
 
-#: contrib/admin/util.py:138
+#: contrib/admin/util.py:168
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Et eller flere %(fieldname)s i %(name)s: %(obj)s"
 
-#: contrib/admin/util.py:143
+#: contrib/admin/util.py:173
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Et eller flere %(fieldname)s i %(name)s:"
 
-#: contrib/admin/widgets.py:70
+#: contrib/admin/widgets.py:71
 msgid "Date:"
 msgstr "Dato:"
 
-#: contrib/admin/widgets.py:70
+#: contrib/admin/widgets.py:71
 msgid "Time:"
 msgstr "Tid:"
 
-#: contrib/admin/widgets.py:94
+#: contrib/admin/widgets.py:95
 msgid "Currently:"
 msgstr "Nuværende:"
 
-#: contrib/admin/widgets.py:94
+#: contrib/admin/widgets.py:95
 msgid "Change:"
 msgstr "Ret:"
 
-#: contrib/admin/widgets.py:123
+#: contrib/admin/widgets.py:124
 msgid "Lookup"
 msgstr "Slå op"
 
-#: contrib/admin/widgets.py:230
+#: contrib/admin/widgets.py:236
 msgid "Add Another"
 msgstr "Tilføj endnu en"
 
@@ -475,10 +497,11 @@ msgstr "Vi beklager, men den ønskede side kunne ikke findes"
 
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:33
+#: contrib/admin/templates/admin/base.html:54
 #: contrib/admin/templates/admin/change_form.html:17
-#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/change_list.html:25
 #: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:6
 #: contrib/admin/templates/admin/invalid_setup.html:4
 #: contrib/admin/templates/admin/object_history.html:6
 #: contrib/admin/templates/admin/auth/user/change_password.html:10
@@ -513,32 +536,40 @@ msgstr ""
 "Der opstod en fejl. Fejlen er rapporteret til website-administratoren via e-"
 "mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed."
 
+#: contrib/admin/templates/admin/actions.html:4
+msgid "Run the selected action"
+msgstr "Udfør den valgte handling"
+
+#: contrib/admin/templates/admin/actions.html:4
+msgid "Go"
+msgstr "Kør"
+
 #: contrib/admin/templates/admin/app_index.html:10
 #: contrib/admin/templates/admin/index.html:19
-#, fuzzy, python-format
+#, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:27
 msgid "Welcome,"
 msgstr "Velkommen,"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:32
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: contrib/admin/templates/admin/base.html:28
-#: contrib/admin/templates/admin/auth/user/change_password.html:13
-#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/admin/base.html:40
+#: contrib/admin/templates/admin/auth/user/change_password.html:14
+#: contrib/admin/templates/admin/auth/user/change_password.html:47
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Change password"
 msgstr "Skift adgangskode"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:47
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Log out"
@@ -569,23 +600,24 @@ msgid "View on site"
 msgstr "Se på website"
 
 #: contrib/admin/templates/admin/change_form.html:38
-#: contrib/admin/templates/admin/auth/user/change_password.html:22
+#: contrib/admin/templates/admin/change_list.html:54
+#: contrib/admin/templates/admin/auth/user/change_password.html:23
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Ret venligst fejlen herunder."
 msgstr[1] "Ret venligst fejlene herunder."
 
-#: contrib/admin/templates/admin/change_list.html:16
+#: contrib/admin/templates/admin/change_list.html:46
 #, python-format
 msgid "Add %(name)s"
 msgstr "Tilføj %(name)s"
 
-#: contrib/admin/templates/admin/change_list.html:26
+#: contrib/admin/templates/admin/change_list.html:65
 msgid "Filter"
 msgstr "Filtrer"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275
 msgid "Delete"
 msgstr "Slet"
 
@@ -610,9 +642,33 @@ msgstr ""
 "de følgende relaterede objekter vil blive slettet:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:28
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:33
 msgid "Yes, I'm sure"
 msgstr "Ja, jeg er sikker"
 
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:9
+msgid "Delete multiple objects"
+msgstr "Slet flere objekter"
+
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:15
+#, python-format
+msgid ""
+"Deleting the %(object_name)s would result in deleting related objects, but "
+"your account doesn't have permission to delete the following types of "
+"objects:"
+msgstr ""
+"Hvis du sletter %(object_name)s, vil du også slette relaterede objekter, "
+"men din konto har ikke rettigheder til at slette følgende objekttyper:"
+
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:22
+#, python-format
+msgid ""
+"Are you sure you want to delete the selected %(object_name)s objects? All of "
+"the following objects and it's related items will be deleted:"
+msgstr ""
+"Er du sikker på du vil slette de valgte %(object_name)s-objekter? Alle "
+"de følgende relaterede objekter vil blive slettet:"
+
 #: contrib/admin/templates/admin/filter.html:2
 #, python-format
 msgid " By %(filter_title)s "
@@ -643,6 +699,10 @@ msgstr "Mine handlinger"
 msgid "None available"
 msgstr "Ingen tilgængelige"
 
+#: contrib/admin/templates/admin/index.html:72
+msgid "Unknown content"
+msgstr "Ukendt indhold"
+
 #: contrib/admin/templates/admin/invalid_setup.html:7
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
@@ -675,7 +735,7 @@ msgid "Action"
 msgstr "Funktion"
 
 #: contrib/admin/templates/admin/object_history.html:30
-#: utils/translation/trans_real.py:404
+#: utils/translation/trans_real.py:400
 msgid "DATETIME_FORMAT"
 msgstr "j. F Y H:i"
 
@@ -691,9 +751,14 @@ msgstr ""
 msgid "Show all"
 msgstr "Vis alle"
 
+#: contrib/admin/templates/admin/pagination.html:11
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Gem"
+
 #: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-msgstr "Kør"
+msgid "Search"
+msgstr "Søg"
 
 #: contrib/admin/templates/admin/search_form.html:10
 #, python-format
@@ -707,10 +772,6 @@ msgstr[1] "%(counter)s resultater"
 msgid "%(full_result_count)s total"
 msgstr "%(full_result_count)s i alt"
 
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Save"
-msgstr "Gem"
-
 #: contrib/admin/templates/admin/submit_line.html:5
 msgid "Save as new"
 msgstr "Gem som ny"
@@ -737,23 +798,23 @@ msgid "Username"
 msgstr "Brugernavn"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:20
-#: contrib/admin/templates/admin/auth/user/change_password.html:33
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184
+#: contrib/admin/templates/admin/auth/user/change_password.html:34
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185
 msgid "Password"
 msgstr "Adgangskode"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:26
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
-#: contrib/auth/forms.py:185
+#: contrib/admin/templates/admin/auth/user/change_password.html:40
+#: contrib/auth/forms.py:186
 msgid "Password (again)"
 msgstr "Adgangskode (igen)"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:27
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
+#: contrib/admin/templates/admin/auth/user/change_password.html:41
 msgid "Enter the same password as above, for verification."
 msgstr "Indtast den samme adgangskode som ovenfor for verifikation."
 
-#: contrib/admin/templates/admin/auth/user/change_password.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:27
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Indtast en ny adgangskode for brugeren <strong>%(username)s</strong>."
@@ -917,166 +978,167 @@ msgstr "E-mail-adresse:"
 msgid "Reset my password"
 msgstr "Nulstil min adgangskode"
 
-#: contrib/admin/templatetags/admin_list.py:284
+#: contrib/admin/templatetags/admin_list.py:299
 msgid "All dates"
 msgstr "Alle datoer"
 
-#: contrib/admin/views/main.py:69
+#: contrib/admin/views/main.py:70
 #, python-format
 msgid "Select %s"
 msgstr "Vælg %s"
 
-#: contrib/admin/views/main.py:69
+#: contrib/admin/views/main.py:70
 #, python-format
 msgid "Select %s to change"
 msgstr "Vælg %s, der skal ændres"
 
-#: contrib/admin/views/template.py:36 contrib/sites/models.py:38
+#: contrib/admin/views/template.py:37 contrib/sites/models.py:38
 msgid "site"
 msgstr "website"
 
-#: contrib/admin/views/template.py:38
+#: contrib/admin/views/template.py:39
 msgid "template"
 msgstr "skabelon"
 
-#: contrib/admindocs/views.py:57 contrib/admindocs/views.py:59
-#: contrib/admindocs/views.py:61
+#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
+#: contrib/admindocs/views.py:65
 msgid "tag:"
 msgstr "tag:"
 
-#: contrib/admindocs/views.py:90 contrib/admindocs/views.py:92
-#: contrib/admindocs/views.py:94
+#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
+#: contrib/admindocs/views.py:98
 msgid "filter:"
 msgstr "filter:"
 
-#: contrib/admindocs/views.py:154 contrib/admindocs/views.py:156
-#: contrib/admindocs/views.py:158
+#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
+#: contrib/admindocs/views.py:162
 msgid "view:"
 msgstr "view:"
 
-#: contrib/admindocs/views.py:186
+#: contrib/admindocs/views.py:190
 #, python-format
 msgid "App %r not found"
 msgstr "Applikationen %r blev ikke fundet"
 
-#: contrib/admindocs/views.py:193
+#: contrib/admindocs/views.py:197
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modellen %(model_name)r ikke fundet i applikationen %(app_label)r"
 
-#: contrib/admindocs/views.py:205
+#: contrib/admindocs/views.py:209
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "det relaterede `%(app_label)s.%(data_type)s`-objekt"
 
-#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:227
-#: contrib/admindocs/views.py:241 contrib/admindocs/views.py:246
+#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
 msgid "model:"
 msgstr "model:"
 
-#: contrib/admindocs/views.py:236
+#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "relaterede `%(app_label)s.%(object_name)s`-objekter"
 
-#: contrib/admindocs/views.py:241
+#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
 #, python-format
 msgid "all %s"
 msgstr "alle %s"
 
-#: contrib/admindocs/views.py:246
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
 #, python-format
 msgid "number of %s"
 msgstr "antal %s"
 
-#: contrib/admindocs/views.py:251
+#: contrib/admindocs/views.py:271
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Felter på %s-objekter"
 
-#: contrib/admindocs/views.py:314 contrib/admindocs/views.py:325
-#: contrib/admindocs/views.py:327 contrib/admindocs/views.py:333
-#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
+#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
+#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
 msgid "Integer"
 msgstr "Heltal"
 
-#: contrib/admindocs/views.py:315
+#: contrib/admindocs/views.py:335
 msgid "Boolean (Either True or False)"
 msgstr "Boolsk (enten True eller False)"
 
-#: contrib/admindocs/views.py:316 contrib/admindocs/views.py:335
+#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Streng (op til %(max_length)s)"
 
-#: contrib/admindocs/views.py:317
+#: contrib/admindocs/views.py:337
 msgid "Comma-separated integers"
 msgstr "Kommaseparerede heltal"
 
-#: contrib/admindocs/views.py:318
+#: contrib/admindocs/views.py:338
 msgid "Date (without time)"
 msgstr "Dato (uden tid)"
 
-#: contrib/admindocs/views.py:319
+#: contrib/admindocs/views.py:339
 msgid "Date (with time)"
 msgstr "Dato (med tid)"
 
-#: contrib/admindocs/views.py:320
+#: contrib/admindocs/views.py:340
 msgid "Decimal number"
 msgstr "Decimaltal"
 
-#: contrib/admindocs/views.py:321
+#: contrib/admindocs/views.py:341
 msgid "E-mail address"
 msgstr "E-mail-adresse"
 
-#: contrib/admindocs/views.py:322 contrib/admindocs/views.py:323
-#: contrib/admindocs/views.py:326
+#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
+#: contrib/admindocs/views.py:346
 msgid "File path"
 msgstr "Sti"
 
-#: contrib/admindocs/views.py:324
+#: contrib/admindocs/views.py:344
 msgid "Floating point number"
 msgstr "Flydende-komma-tal"
 
-#: contrib/admindocs/views.py:328 contrib/comments/models.py:58
+#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: contrib/admindocs/views.py:330
+#: contrib/admindocs/views.py:350
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolsk (True, False eller None)"
 
-#: contrib/admindocs/views.py:331
+#: contrib/admindocs/views.py:351
 msgid "Relation to parent model"
 msgstr "Relation til forældermodel"
 
-#: contrib/admindocs/views.py:332
+#: contrib/admindocs/views.py:352
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: contrib/admindocs/views.py:337
+#: contrib/admindocs/views.py:357
 msgid "Text"
 msgstr "Tekst"
 
-#: contrib/admindocs/views.py:338
+#: contrib/admindocs/views.py:358
 msgid "Time"
 msgstr "Tid"
 
-#: contrib/admindocs/views.py:339 contrib/comments/forms.py:21
+#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
 #: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "URL"
 
-#: contrib/admindocs/views.py:340
+#: contrib/admindocs/views.py:360
 msgid "U.S. state (two uppercase letters)"
 msgstr "Stat (i USA, to store bogstaver)"
 
-#: contrib/admindocs/views.py:341
+#: contrib/admindocs/views.py:361
 msgid "XML text"
 msgstr "XML-tekst"
 
-#: contrib/admindocs/views.py:367
+#: contrib/admindocs/views.py:387
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ser ikke ud til at være et urlpattern-objekt"
@@ -1168,21 +1230,21 @@ msgstr "Vigtige datoer"
 msgid "Groups"
 msgstr "Grupper"
 
-#: contrib/auth/admin.py:64
+#: contrib/auth/admin.py:80
 msgid "Add user"
 msgstr "Tilføj bruger"
 
-#: contrib/auth/admin.py:90
+#: contrib/auth/admin.py:106
 msgid "Password changed successfully."
 msgstr "Adgangskoden blev ændret."
 
-#: contrib/auth/admin.py:96
+#: contrib/auth/admin.py:112
 #, python-format
 msgid "Change password: %s"
 msgstr "Skift adgangskode: %s"
 
 #: contrib/auth/forms.py:15 contrib/auth/forms.py:48
-#: contrib/auth/models.py:127
+#: contrib/auth/models.py:128
 msgid ""
 "Required. 30 characters or fewer. Alphanumeric characters only (letters, "
 "digits and underscores)."
@@ -1202,8 +1264,8 @@ msgstr "Bekræftelse af adgangskode"
 msgid "A user with that username already exists."
 msgstr "En bruger med dette brugernavn findes allerede."
 
-#: contrib/auth/forms.py:36 contrib/auth/forms.py:154
-#: contrib/auth/forms.py:196
+#: contrib/auth/forms.py:36 contrib/auth/forms.py:155
+#: contrib/auth/forms.py:197
 msgid "The two password fields didn't match."
 msgstr "De to adgangskoder var ikke identiske."
 
@@ -1231,24 +1293,24 @@ msgstr ""
 "Den e-mail-adresse er ikke tilknyttet en konto. Er du sikker på at du har "
 "registreret dig?"
 
-#: contrib/auth/forms.py:134
+#: contrib/auth/forms.py:135
 #, python-format
 msgid "Password reset on %s"
 msgstr "Adgangskode nulstillet på %s"
 
-#: contrib/auth/forms.py:142
+#: contrib/auth/forms.py:143
 msgid "New password"
 msgstr "Ny adgangskode"
 
-#: contrib/auth/forms.py:143
+#: contrib/auth/forms.py:144
 msgid "New password confirmation"
 msgstr "Bekræftelse af ny adgangskode"
 
-#: contrib/auth/forms.py:168
+#: contrib/auth/forms.py:169
 msgid "Old password"
 msgstr "Gammel adgangskode"
 
-#: contrib/auth/forms.py:176
+#: contrib/auth/forms.py:177
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Din gamle adgangskode blev ikke indtastet korrekt. Indtast den venligst igen."
@@ -1273,31 +1335,31 @@ msgstr "rettigheder"
 msgid "group"
 msgstr "gruppe"
 
-#: contrib/auth/models.py:91 contrib/auth/models.py:137
+#: contrib/auth/models.py:91 contrib/auth/models.py:138
 msgid "groups"
 msgstr "grupper"
 
-#: contrib/auth/models.py:127
+#: contrib/auth/models.py:128
 msgid "username"
 msgstr "brugernavn"
 
-#: contrib/auth/models.py:128
+#: contrib/auth/models.py:129
 msgid "first name"
 msgstr "fornavn"
 
-#: contrib/auth/models.py:129
+#: contrib/auth/models.py:130
 msgid "last name"
 msgstr "efternavn"
 
-#: contrib/auth/models.py:130
+#: contrib/auth/models.py:131
 msgid "e-mail address"
 msgstr "e-mail-adresse"
 
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:132
 msgid "password"
 msgstr "adgangskode"
 
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:132
 msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
@@ -1305,19 +1367,19 @@ msgstr ""
 "Brug '[algo]$[salt]$[hexdigest]' eller brug <a href=\"password/\">formularen "
 "til skift af adgangskode</a>."
 
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:133
 msgid "staff status"
 msgstr "admin-status"
 
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:133
 msgid "Designates whether the user can log into this admin site."
 msgstr "Bestemmer om brugeren kan logge ind på dette administrationswebsite."
 
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:134
 msgid "active"
 msgstr "aktiv"
 
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:134
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -1325,26 +1387,26 @@ msgstr ""
 "Bestemmer om brugeren skal behandles som aktiv. Fravælg dette frem for at "
 "slette en konto."
 
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:135
 msgid "superuser status"
 msgstr "superbrugerstatus"
 
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:135
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Bestemmer at denne bruger har alle rettigheder uden at tildele dem eksplicit."
 
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:136
 msgid "last login"
 msgstr "sidst logget ind"
 
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:137
 msgid "date joined"
 msgstr "dato for registrering"
 
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:139
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
@@ -1352,27 +1414,28 @@ msgstr ""
 "Udover de rettigheder, der manuelt er tildelt brugeren, vil denne også få "
 "alle rettigheder, der er tildelt hver gruppe, brugeren er medlem af."
 
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:140
 msgid "user permissions"
 msgstr "Rettigheder"
 
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:144 contrib/comments/models.py:50
+#: contrib/comments/models.py:168
 msgid "user"
 msgstr "bruger"
 
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:145
 msgid "users"
 msgstr "brugere"
 
-#: contrib/auth/models.py:300
+#: contrib/auth/models.py:301
 msgid "message"
 msgstr "meddelelse"
 
-#: contrib/auth/views.py:50
+#: contrib/auth/views.py:56
 msgid "Logged out"
 msgstr "Logget ud"
 
-#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
+#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429
 msgid "Enter a valid e-mail address."
 msgstr "Indtast en gyldig e-mail-adresse."
 
@@ -1384,73 +1447,88 @@ msgstr "Indhold"
 msgid "Metadata"
 msgstr "Metadata"
 
-#: contrib/comments/forms.py:19
+#: contrib/comments/feeds.py:13
+#, python-format
+msgid "%(site_name)s comments"
+msgstr "kommentarer på %(site_name)s"
+
+#: contrib/comments/feeds.py:23
+#, python-format
+msgid "Latest comments on %(site_name)s"
+msgstr "Seneste kommentarer på %(site_name)s"
+
+#: contrib/comments/forms.py:93
 #: contrib/comments/templates/comments/moderation_queue.html:34
 msgid "Name"
 msgstr "Navn"
 
-#: contrib/comments/forms.py:20
+#: contrib/comments/forms.py:94
 msgid "Email address"
 msgstr "E-mail-adresse"
 
-#: contrib/comments/forms.py:22
+#: contrib/comments/forms.py:96
 #: contrib/comments/templates/comments/moderation_queue.html:35
 msgid "Comment"
 msgstr "Kommentar"
 
-#: contrib/comments/forms.py:25
-msgid ""
-"If you enter anything in this field your comment will be treated as spam"
-msgstr ""
-"Hvis du indtaster noget i dette felt, vil din kommentar blive betragtet som "
-"spam."
-
-#: contrib/comments/forms.py:125
+#: contrib/comments/forms.py:173
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
 msgstr[0] "Var din mund! Ordet %s er ikke tilladt her."
 msgstr[1] "Var din mund! Ordene %s er ikke tilladt her."
 
-#: contrib/comments/models.py:23
+#: contrib/comments/forms.py:180
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr ""
+"Hvis du indtaster noget i dette felt, vil din kommentar blive betragtet som "
+"spam."
+
+#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
+msgid "content type"
+msgstr "indholdstype"
+
+#: contrib/comments/models.py:24
 msgid "object ID"
 msgstr "objekt-ID"
 
-#: contrib/comments/models.py:50
+#: contrib/comments/models.py:52
 msgid "user's name"
 msgstr "brugerens navn"
 
-#: contrib/comments/models.py:51
+#: contrib/comments/models.py:53
 msgid "user's email address"
 msgstr "brugerens e-mail-adresse"
 
-#: contrib/comments/models.py:52
+#: contrib/comments/models.py:54
 msgid "user's URL"
 msgstr "brugerens URL"
 
-#: contrib/comments/models.py:54
+#: contrib/comments/models.py:56 contrib/comments/models.py:76
+#: contrib/comments/models.py:169
 msgid "comment"
 msgstr "kommentar"
 
-#: contrib/comments/models.py:57
+#: contrib/comments/models.py:59
 msgid "date/time submitted"
 msgstr "dato/tidspunkt for oprettelse"
 
-#: contrib/comments/models.py:59
+#: contrib/comments/models.py:61
 msgid "is public"
 msgstr "er offentlig"
 
-#: contrib/comments/models.py:60
+#: contrib/comments/models.py:62
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Hvis du fjerner afkrydsningen her, bliver din kommentar slettet fra sitet."
 
-#: contrib/comments/models.py:62
+#: contrib/comments/models.py:64
 msgid "is removed"
 msgstr "er fjernet"
 
-#: contrib/comments/models.py:63
+#: contrib/comments/models.py:65
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -1458,7 +1536,11 @@ msgstr ""
 "Afkryds denne boks, hvis kommentaren er upassende. Beskeden \"Denne "
 "kommentar er blevet fjernet\" vil blive vist i stedet."
 
-#: contrib/comments/models.py:115
+#: contrib/comments/models.py:77
+msgid "comments"
+msgstr "kommentarer"
+
+#: contrib/comments/models.py:119
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -1466,7 +1548,7 @@ msgstr ""
 "Denne kommentar blev indsendt af en autenticeret bruger; derfor er navnet "
 "skrivebeskyttet."
 
-#: contrib/comments/models.py:124
+#: contrib/comments/models.py:128
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -1474,7 +1556,7 @@ msgstr ""
 "Denne kommentar blev indsendt af en autenticeret bruger; derfor er e-mail-"
 "adressen skrivebeskyttet."
 
-#: contrib/comments/models.py:149
+#: contrib/comments/models.py:153
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -1489,6 +1571,22 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
+#: contrib/comments/models.py:170
+msgid "flag"
+msgstr "Flag"
+
+#: contrib/comments/models.py:171
+msgid "date"
+msgstr "dato"
+
+#: contrib/comments/models.py:181
+msgid "comment flag"
+msgstr "kommentarflag"
+
+#: contrib/comments/models.py:182
+msgid "comment flags"
+msgstr "kommentarflag"
+
 #: contrib/comments/templates/comments/approve.html:4
 msgid "Approve a comment"
 msgstr "Godkend en kommentar"
@@ -1548,13 +1646,13 @@ msgstr "Flag"
 msgid "Thanks for flagging"
 msgstr "Tak for flagningen"
 
-#: contrib/comments/templates/comments/form.html:16
-#: contrib/comments/templates/comments/preview.html:31
+#: contrib/comments/templates/comments/form.html:17
+#: contrib/comments/templates/comments/preview.html:32
 msgid "Post"
 msgstr "Indsend"
 
-#: contrib/comments/templates/comments/form.html:17
-#: contrib/comments/templates/comments/preview.html:32
+#: contrib/comments/templates/comments/form.html:18
+#: contrib/comments/templates/comments/preview.html:33
 msgid "Preview"
 msgstr "Forhåndsvis"
 
@@ -1600,33 +1698,29 @@ msgid "Thank you for your comment"
 msgstr "Tak for kommentaren"
 
 #: contrib/comments/templates/comments/preview.html:4
-#: contrib/comments/templates/comments/preview.html:12
+#: contrib/comments/templates/comments/preview.html:13
 msgid "Preview your comment"
 msgstr "Forhåndsvis kommentar"
 
-#: contrib/comments/templates/comments/preview.html:10
+#: contrib/comments/templates/comments/preview.html:11
 msgid "Please correct the error below"
 msgid_plural "Please correct the errors below"
 msgstr[0] "Ret venligst fejlen herunder."
 msgstr[1] "Ret venligst fejlene herunder."
 
-#: contrib/comments/templates/comments/preview.html:15
+#: contrib/comments/templates/comments/preview.html:16
 msgid "Post your comment"
 msgstr "Indsend din kommentar"
 
-#: contrib/comments/templates/comments/preview.html:15
+#: contrib/comments/templates/comments/preview.html:16
 msgid "or make changes"
 msgstr "eller gennemfør ændringer"
 
-#: contrib/contenttypes/models.py:67
+#: contrib/contenttypes/models.py:70
 msgid "python model class name"
 msgstr "klassenavn i Python-model"
 
-#: contrib/contenttypes/models.py:71
-msgid "content type"
-msgstr "indholdstype"
-
-#: contrib/contenttypes/models.py:72
+#: contrib/contenttypes/models.py:75
 msgid "content types"
 msgstr "indholdstyper"
 
@@ -1699,18 +1793,24 @@ msgstr ""
 "Tiden er udløbet - vi beklager. Vær venlig at fortsætte med at udfylde "
 "formularen på denne side."
 
-#: contrib/gis/forms/fields.py:14
+#: contrib/gis/forms/fields.py:17
 msgid "No geometry value provided."
 msgstr "Ingen værdi givet for geometri."
 
-#: contrib/gis/forms/fields.py:15
+#: contrib/gis/forms/fields.py:18
 msgid "Invalid geometry value."
 msgstr "Ugyldig geometriværdi."
 
-#: contrib/gis/forms/fields.py:16
+#: contrib/gis/forms/fields.py:19
 msgid "Invalid geometry type."
 msgstr "Ugyldig gemometritype."
 
+#: contrib/gis/forms/fields.py:20
+msgid ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
+msgstr ""
+
 #: contrib/humanize/templatetags/humanize.py:19
 msgid "th"
 msgstr "."
@@ -2029,6 +2129,82 @@ msgstr "Indtast en gyldig chilensk RUT. Formatet er XX.XXX.XXX-X."
 msgid "The Chilean RUT is not valid."
 msgstr "Den chilenske RUT er ugyldig."
 
+#: contrib/localflavor/cz/cz_regions.py:8
+msgid "Prague"
+msgstr "Prag"
+
+#: contrib/localflavor/cz/cz_regions.py:9
+msgid "Central Bohemian Region"
+msgstr "Centrale Böhmen"
+
+#: contrib/localflavor/cz/cz_regions.py:10
+msgid "South Bohemian Region"
+msgstr "Sydlige Böhmen"
+
+#: contrib/localflavor/cz/cz_regions.py:11
+msgid "Pilsen Region"
+msgstr "Pilsen-regionen"
+
+#: contrib/localflavor/cz/cz_regions.py:12
+msgid "Carlsbad Region"
+msgstr "Carlsbad-regionen"
+
+#: contrib/localflavor/cz/cz_regions.py:13
+msgid "Usti Region"
+msgstr "Usti-regionen"
+
+#: contrib/localflavor/cz/cz_regions.py:14
+msgid "Liberec Region"
+msgstr "Liberec-regionen"
+
+#: contrib/localflavor/cz/cz_regions.py:15
+msgid "Hradec Region"
+msgstr "Hradec-regionen"
+
+#: contrib/localflavor/cz/cz_regions.py:16
+msgid "Pardubice Region"
+msgstr "Pardubice-region"
+
+#: contrib/localflavor/cz/cz_regions.py:17
+msgid "Vysocina Region"
+msgstr "Vysocina region"
+
+#: contrib/localflavor/cz/cz_regions.py:18
+msgid "South Moravian Region"
+msgstr "Sydmoravien"
+
+#: contrib/localflavor/cz/cz_regions.py:19
+msgid "Olomouc Region"
+msgstr "Olomuc-regionen"
+
+#: contrib/localflavor/cz/cz_regions.py:20
+msgid "Zlin Region"
+msgstr "Zlin-regionen"
+
+#: contrib/localflavor/cz/cz_regions.py:21
+msgid "Moravian-Silesian Region"
+msgstr "Moravien-Silesien"
+
+#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30
+msgid "Enter a postal code in the format XXXXX or XXX XX."
+msgstr "Indtast et postnr. i format XXXXX eller XXX XX."
+
+#: contrib/localflavor/cz/forms.py:47
+msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
+msgstr "Indtast et fødselsnr. i formatet XXXXXX/XXXX or XXXXXXXXXX."
+
+#: contrib/localflavor/cz/forms.py:48
+msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
+msgstr "Ugyldig værdi for køn. Gyldige værdier er 'f' og 'm'."
+
+#: contrib/localflavor/cz/forms.py:49
+msgid "Enter a valid birth number."
+msgstr "Indtast et gyldigt fødselsnummer."
+
+#: contrib/localflavor/cz/forms.py:106
+msgid "Enter a valid IC number."
+msgstr "Indtast et IC-nummer."
+
 #: contrib/localflavor/de/de_states.py:5
 msgid "Baden-Wuerttemberg"
 msgstr "Baden-Wuerttemberg"
@@ -2096,7 +2272,7 @@ msgstr "Thuringia"
 #: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
 #: contrib/localflavor/fr/forms.py:15
 msgid "Enter a zip code in the format XXXXX."
-msgstr ""
+msgstr "Indtast et postnummer i formatet XXXXX"
 
 #: contrib/localflavor/de/forms.py:41
 msgid ""
@@ -2766,15 +2942,15 @@ msgstr "Zacatecas"
 
 #: contrib/localflavor/nl/forms.py:21
 msgid "Enter a valid postal code"
-msgstr ""
+msgstr "Indtast et gyldigt postnummer"
 
 #: contrib/localflavor/nl/forms.py:52
 msgid "Enter a valid phone number"
-msgstr ""
+msgstr "Indtast et gyldigt telefonnummer"
 
 #: contrib/localflavor/nl/forms.py:78
 msgid "Enter a valid SoFi number"
-msgstr ""
+msgstr "Indtast et gyldigt SoFi-nummer"
 
 #: contrib/localflavor/nl/nl_provinces.py:4
 msgid "Drenthe"
@@ -2853,15 +3029,15 @@ msgstr "Indtast et NIP i formatet XXX-XXX-XX-XX or XX-XX-XXX-XXX."
 msgid "Wrong checksum for the Tax Number (NIP)."
 msgstr "Forkert kontrolsum for NIP. "
 
-#: contrib/localflavor/pl/forms.py:111
-msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
-msgstr "REGON skal består af 7 eller 9 cifre."
+#: contrib/localflavor/pl/forms.py:109
+msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
+msgstr "National Business Register Number (REGON) består af 9 eller 14 cifre."
 
-#: contrib/localflavor/pl/forms.py:112
+#: contrib/localflavor/pl/forms.py:110
 msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Foerkert kontrolsum for REGON."
+msgstr "Forkert kontrolsum for REGON-nr."
 
-#: contrib/localflavor/pl/forms.py:155
+#: contrib/localflavor/pl/forms.py:148
 msgid "Enter a postal code in the format XX-XXX."
 msgstr "Indtast et postnummer i formatet XX-XXX."
 
@@ -2949,10 +3125,6 @@ msgstr "Telefinnumre skal være i formatet XXXX-XXXXXX."
 msgid "Enter a valid postal code in the format XXXXXX"
 msgstr "Indtast et gyldigt postnummer i formatet XXXXXX"
 
-#: contrib/localflavor/sk/forms.py:30
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Indtast et postnr. i format XXXXX eller XXX XX."
-
 #: contrib/localflavor/sk/sk_districts.py:8
 msgid "Banska Bystrica"
 msgstr "Banska Bystrica"
@@ -3639,7 +3811,7 @@ msgstr "Western Cape"
 
 #: contrib/redirects/models.py:7
 msgid "redirect from"
-msgstr ""
+msgstr "rediriger fra"
 
 #: contrib/redirects/models.py:8
 msgid ""
@@ -3651,7 +3823,7 @@ msgstr ""
 
 #: contrib/redirects/models.py:9
 msgid "redirect to"
-msgstr "omadresser til"
+msgstr "rediriger til"
 
 #: contrib/redirects/models.py:10
 msgid ""
@@ -3663,11 +3835,11 @@ msgstr ""
 
 #: contrib/redirects/models.py:13
 msgid "redirect"
-msgstr "omadresser"
+msgstr "rediriger"
 
 #: contrib/redirects/models.py:14
 msgid "redirects"
-msgstr "omaddresseringer"
+msgstr "redirigeringer"
 
 #: contrib/sessions/models.py:45
 msgid "session key"
@@ -3701,55 +3873,59 @@ msgstr "vist navn"
 msgid "sites"
 msgstr "websites"
 
-#: db/models/fields/__init__.py:348 db/models/fields/__init__.py:683
+#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
 msgid "This value must be an integer."
 msgstr "Denne værdi skal et heltal."
 
-#: db/models/fields/__init__.py:379
+#: db/models/fields/__init__.py:388
 msgid "This value must be either True or False."
 msgstr "Denne værdi skal være enten True eller False."
 
-#: db/models/fields/__init__.py:412
+#: db/models/fields/__init__.py:427
 msgid "This field cannot be null."
 msgstr "Dette felt kan ikke være null."
 
-#: db/models/fields/__init__.py:428
+#: db/models/fields/__init__.py:443
 msgid "Enter only digits separated by commas."
 msgstr "Indtast kun cifre adskilt af kommaer."
 
-#: db/models/fields/__init__.py:459
+#: db/models/fields/__init__.py:474
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Indtast en gyldig dato i formatet ÅÅÅÅ-MM-DD."
 
-#: db/models/fields/__init__.py:468
+#: db/models/fields/__init__.py:483
 #, python-format
 msgid "Invalid date: %s"
 msgstr "Ugyldig dato: %s"
 
-#: db/models/fields/__init__.py:532 db/models/fields/__init__.py:550
+#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
 msgstr "Indtast gyldig dato og tid i formatet ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:586
+#: db/models/fields/__init__.py:601
 msgid "This value must be a decimal number."
 msgstr "Denne værdi skal et decimaltal."
 
-#: db/models/fields/__init__.py:719
+#: db/models/fields/__init__.py:686
+msgid "This value must be a float."
+msgstr "Denne værdi skal være et kommatal."
+
+#: db/models/fields/__init__.py:746
 msgid "This value must be either None, True or False."
 msgstr "Denne værdi skal være None, True eller False."
 
-#: db/models/fields/__init__.py:817 db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "Indtast en gyldig tid i formatet TT:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/related.py:761
+#: db/models/fields/related.py:816
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Hold \"Ctrl\" (eller \"Æbletasten\" på Mac) nede for at vælge mere end en."
 
-#: db/models/fields/related.py:838
-#, fuzzy, python-format
+#: db/models/fields/related.py:894
+#, 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."
@@ -3810,31 +3986,37 @@ msgstr "Der må højst være %s decimalpladser."
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Der må maksimalt være %s cifre før decimaltegnet."
 
-#: forms/fields.py:287 forms/fields.py:849
+#: forms/fields.py:288 forms/fields.py:863
 msgid "Enter a valid date."
 msgstr "Indtast en gyldig dato."
 
-#: forms/fields.py:321 forms/fields.py:850
+#: forms/fields.py:322 forms/fields.py:864
 msgid "Enter a valid time."
 msgstr "Indtast en gyldig tid."
 
-#: forms/fields.py:360
+#: forms/fields.py:361
 msgid "Enter a valid date/time."
 msgstr "Indtast gyldig dato/tid."
 
-#: forms/fields.py:446
+#: forms/fields.py:447
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Ingen fil blev indsendt. Kontroller kodningstypen i formularen."
 
-#: forms/fields.py:447
+#: forms/fields.py:448
 msgid "No file was submitted."
 msgstr "Ingen fil blev indsendt."
 
-#: forms/fields.py:448
+#: forms/fields.py:449
 msgid "The submitted file is empty."
 msgstr "Den indsendte fil er tom."
 
-#: forms/fields.py:477
+#: forms/fields.py:450
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr "Denne værdi må maksimalt indeholde %(max)d tegn (den har %(length)d)."
+
+#: forms/fields.py:483
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -3842,107 +4024,141 @@ msgstr ""
 "Indsend en billedfil. Filen, du indsendte, var enten ikke et billede eller "
 "en defekt billedfil."
 
-#: forms/fields.py:538
+#: forms/fields.py:544
 msgid "Enter a valid URL."
 msgstr "Indtast en gyldig URL."
 
-#: forms/fields.py:539
+#: forms/fields.py:545
 msgid "This URL appears to be a broken link."
 msgstr "Denne URL henviser ikke til en gyldig side eller fil."
 
-#: forms/fields.py:618 forms/fields.py:696
+#: forms/fields.py:625 forms/fields.py:703
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 "Marker en gyldigt valgmulighed; '%(value)s' er ikke en af de tilgængelige "
 "valgmuligheder."
 
-#: forms/fields.py:697 forms/fields.py:758 forms/models.py:714
+#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
 msgid "Enter a list of values."
 msgstr "Indtast en liste af værdier."
 
-#: forms/fields.py:878
+#: forms/fields.py:892
 msgid "Enter a valid IPv4 address."
 msgstr "Indtast en gyldig IPv4-adresse."
 
-#: forms/fields.py:888
+#: forms/fields.py:902
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Dette felt må kun indeholde bogstaver, cifre, understreger og bindestreger."
 
-#: forms/formsets.py:242 forms/formsets.py:244
+#: forms/formsets.py:271 forms/formsets.py:273
 msgid "Order"
 msgstr "Rækkefølge"
 
-#: forms/models.py:281 forms/models.py:290
+#: forms/models.py:367
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr "%(field_name)s skal være unik for %(date_field)s %(lookup)s."
+
+#: forms/models.py:381 forms/models.py:389
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s med dette %(field_label)s eksisterer allerede."
 
-#: forms/models.py:581
-msgid "The inline foreign key did not match the parent instance primary key."
-msgstr "Den indlejrede fremmednøgle passede ikke med forælderinstansens primærnøgle."
+#: forms/models.py:594
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Ret venligst duplikerede data for %(field)s."
 
-#: forms/models.py:644
+#: forms/models.py:598
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr "Ret venligst de duplikerede data for %(field)s, som skal være unik."
+
+#: forms/models.py:604
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"Ret venligst de duplikerede data for %(field_name)s, som skal være unik "
+"for %(lookup)s i %(date_field)s."
+
+#: forms/models.py:612
+msgid "Please correct the duplicate values below."
+msgstr "Ret venligst de duplikerede data herunder."
+
+#: forms/models.py:867
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+"Den indlejrede fremmednøgle passede ikke med forælderinstansens primærnøgle."
+
+#: forms/models.py:930
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Marker en gyldig valgmulighed. Det valg, du har foretaget, er ikke blandt de "
 "tilgængelige valgmuligheder."
 
-#: forms/models.py:715
+#: forms/models.py:1004
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Marker et gyldigt valg. %s er ikke en af de tilgængelige valgmuligheder."
 
-#: template/defaultfilters.py:743
+#: forms/models.py:1006
+#, python-format
+msgid "\"%s\" is not a valid value for a primary key."
+msgstr "\"%s\" er ikke en gyldig værdi for en primærnøgle."
+
+#: template/defaultfilters.py:767
 msgid "yes,no,maybe"
 msgstr "ja,nej,måske"
 
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:798
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:776
+#: template/defaultfilters.py:800
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:778
+#: template/defaultfilters.py:802
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:779
+#: template/defaultfilters.py:803
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: utils/dateformat.py:41
+#: utils/dateformat.py:42
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:42
+#: utils/dateformat.py:43
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:47
+#: utils/dateformat.py:48
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:48
+#: utils/dateformat.py:49
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:97
+#: utils/dateformat.py:98
 msgid "midnight"
 msgstr "midnat"
 
-#: utils/dateformat.py:99
+#: utils/dateformat.py:100
 msgid "noon"
 msgstr "middag"
 
@@ -4166,33 +4382,33 @@ msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutter"
 
-#: utils/timesince.py:43
+#: utils/timesince.py:45
 msgid "minutes"
 msgstr "minutter"
 
-#: utils/timesince.py:48
+#: utils/timesince.py:50
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:54
+#: utils/timesince.py:56
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: utils/translation/trans_real.py:403
+#: utils/translation/trans_real.py:399
 msgid "DATE_FORMAT"
 msgstr "j. F Y"
 
-#: utils/translation/trans_real.py:405
+#: utils/translation/trans_real.py:401
 msgid "TIME_FORMAT"
 msgstr "H:i"
 
-#: utils/translation/trans_real.py:421
+#: utils/translation/trans_real.py:417
 msgid "YEAR_MONTH_FORMAT"
 msgstr "F Y"
 
-#: utils/translation/trans_real.py:422
+#: utils/translation/trans_real.py:418
 msgid "MONTH_DAY_FORMAT"
 msgstr "j. F"
 
@@ -4211,404 +4427,3 @@ msgstr "%(verbose_name)s blev opdateret."
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s blev slettet."
 
-#~ msgid "headline"
-#~ msgstr "overskrift"
-
-#~ msgid "rating #1"
-#~ msgstr "bedømmelse: 1"
-
-#~ msgid "rating #2"
-#~ msgstr "bedømmelse: 2"
-
-#~ msgid "rating #3"
-#~ msgstr "bedømmelse: 3"
-
-#~ msgid "rating #4"
-#~ msgstr "bedømmelse: 4"
-
-#~ msgid "rating #5"
-#~ msgstr "bedømmelse: 5"
-
-#~ msgid "rating #6"
-#~ msgstr "bedømmelse: 6"
-
-#~ msgid "rating #7"
-#~ msgstr "bedømmelse: 7"
-
-#~ msgid "rating #8"
-#~ msgstr "bedømmelse: 8"
-
-#~ msgid "is valid rating"
-#~ msgstr "er en gyldig bedømmelse"
-
-#~ msgid "comments"
-#~ msgstr "kommentarer"
-
-#~ msgid "Content object"
-#~ msgstr "Indholdsobjekt"
-
-#~ msgid "person's name"
-#~ msgstr "personens navn"
-
-#~ msgid "ip address"
-#~ msgstr "IP-adresse"
-
-#~ msgid "approved by staff"
-#~ msgstr "godkendt af personale"
-
-#~ msgid "free comments"
-#~ msgstr "frie kommentarer"
-
-#~ msgid "score"
-#~ msgstr "score"
-
-#~ msgid "score date"
-#~ msgstr "scoringsdato"
-
-#~ msgid "karma score"
-#~ msgstr "karma-score"
-
-#~ msgid "karma scores"
-#~ msgstr "karma-scores"
-
-#~ msgid "%(score)d rating by %(user)s"
-#~ msgstr "%(score)d bedømmelse efter %(user)s"
-
-#~ msgid ""
-#~ "This comment was flagged by %(user)s:\n"
-#~ "\n"
-#~ "%(text)s"
-#~ msgstr ""
-#~ "Denne kommentar blev mærket af %(user)s:\n"
-#~ "\n"
-#~ "%(text)s"
-
-#~ msgid "flag date"
-#~ msgstr "mærkningsdato"
-
-#~ msgid "user flag"
-#~ msgstr "brugermærke"
-
-#~ msgid "user flags"
-#~ msgstr "brugermærker"
-
-#~ msgid "Flag by %r"
-#~ msgstr "Mærket af %r"
-
-#~ msgid "deletion date"
-#~ msgstr "sletningsdato"
-
-#~ msgid "moderator deletion"
-#~ msgstr "moderatorsletning"
-
-#~ msgid "moderator deletions"
-#~ msgstr "moderatorsletninger"
-
-#~ msgid "Moderator deletion by %r"
-#~ msgstr "Moderatorsletning af %r"
-
-#~ msgid "Forgotten your password?"
-#~ msgstr "Har du glemt din adgangskode?"
-
-#~ msgid "Ratings"
-#~ msgstr "Bedømmelser"
-
-#~ msgid "Required"
-#~ msgstr "Påkrævet"
-
-#~ msgid "Optional"
-#~ msgstr "Valgfri"
-
-#~ msgid "Post a photo"
-#~ msgstr "Indsend et foto"
-
-#~ msgid "Your name:"
-#~ msgstr "Dit navn:"
-
-#~ msgid ""
-#~ "This rating is required because you've entered at least one other rating."
-#~ msgstr ""
-#~ "Denne bedømmelse er påkrævet fordi du har indtastet mindst en anden "
-#~ "bedømmelse."
-
-#~ msgid ""
-#~ "This comment was posted by a user who has posted fewer than %(count)s "
-#~ "comment:\n"
-#~ "\n"
-#~ "%(text)sThis comment was posted by a user who has posted fewer than %"
-#~ "(count)s comments:\n"
-#~ "\n"
-#~ "%(text)s"
-#~ msgstr ""
-#~ "Denne kommentar blev indsendt af en bruger, som har indsendt færre end %"
-#~ "(count)s kommentar:\n"
-#~ "\n"
-#~ "%(text)sDenne kommentar blev indsendt af en bruger som har indsendt færre "
-#~ "end %(count)s kommentarer:\n"
-#~ "\n"
-#~ "%(text)s"
-
-#~ msgid "Only POSTs are allowed"
-#~ msgstr "Kun POST er tilladt"
-
-#~ msgid "One or more of the required fields wasn't submitted"
-#~ msgstr "Et eller flere af de påkrævede felter blev ikke indsendt"
-
-#~ msgid "Somebody tampered with the comment form (security violation)"
-#~ msgstr "Nogen har misbrugt kommentarformularen (sikkerhedsovertrædelse)"
-
-#~ msgid ""
-#~ "The comment form had an invalid 'target' parameter -- the object ID was "
-#~ "invalid"
-#~ msgstr ""
-#~ "Kommentarformularen havde en ugyldigt 'target'-parameter - objekt-ID'et "
-#~ "var ugyldigt"
-
-#~ msgid "The comment form didn't provide either 'preview' or 'post'"
-#~ msgstr ""
-#~ "Kommentarformularen tilbød ikke hverken 'forhåndsvis' eller 'indsend'"
-
-#~ msgid "Anonymous users cannot vote"
-#~ msgstr "Anonyme brugere kan ikke stemme"
-
-#~ msgid "Invalid comment ID"
-#~ msgstr "Ugyldigt kommentar-ID"
-
-#~ msgid "No voting for yourself"
-#~ msgstr "Du kan ikke selv stemme"
-
-#~ msgid "Uppercase letters are not allowed here."
-#~ msgstr "Store bogstaver er ikke tilladt her."
-
-#~ msgid "Lowercase letters are not allowed here."
-#~ msgstr "Små bogstaver er ikke tilladt her."
-
-#~ msgid "Enter valid e-mail addresses separated by commas."
-#~ msgstr "Indtast gyldige e-mail-adresser adskilt af kommaer."
-
-#~ msgid "Please enter a valid IP address."
-#~ msgstr "Indtast venligst en gyldig IP-adresse."
-
-#~ msgid "Empty values are not allowed here."
-#~ msgstr "Dette felt må ikke være tomt."
-
-#~ msgid "Non-numeric characters aren't allowed here."
-#~ msgstr "Ikke-numeriske tegn er ikke tilladt her."
-
-#~ msgid "This value can't be comprised solely of digits."
-#~ msgstr "Denne værdi kan ikke udelukkende bestå af cifre."
-
-#~ msgid "Only alphabetical characters are allowed here."
-#~ msgstr "Her er kun bogstaver tilladt."
-
-#~ msgid "Enter a valid time in HH:MM format."
-#~ msgstr "Indtast en gyldig tid i formatet TT:MM."
-
-#~ msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-#~ msgstr "Indtast dato og tidspunkt i formatet ÅÅÅÅ-MM-DD TT:MM."
-
-#~ msgid "The URL %s does not point to a valid image."
-#~ msgstr "URL'en %s henviser ikke til en gyldig billedfil."
-
-#~ msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-#~ msgstr "Telefonnumre skal være i formatet XXX-XXX-XXXX. \"%s\" er ugyldigt."
-
-#~ msgid "The URL %s does not point to a valid QuickTime video."
-#~ msgstr "URL'en %s henviser ikke til en gyldig QuickTime-video."
-
-#~ msgid "A valid URL is required."
-#~ msgstr "En gyldig URL er påkrævet."
-
-#~ msgid ""
-#~ "Valid HTML is required. Specific errors are:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Gyldig HTML er påkrævet. Specifikke fejl:\n"
-#~ "%s"
-
-#~ msgid "Badly formed XML: %s"
-#~ msgstr "Ugyldig XML: %s"
-
-#~ msgid "Invalid URL: %s"
-#~ msgstr "Ugyldig URL: %s"
-
-#~ msgid "The URL %s is a broken link."
-#~ msgstr "Denne URL %s henviser ikke til en gyldig side eller fil."
-
-#~ msgid "Enter a valid U.S. state abbreviation."
-#~ msgstr "Indtast en gyldig amerikansk statsforkortelse."
-
-#~ msgid "This field must match the '%s' field."
-#~ msgstr "Dette felt skal matche feltet '%s'."
-
-#~ msgid "Please enter something for at least one field."
-#~ msgstr "Indtast venligst noget i mindst ét felt"
-
-#~ msgid "Please enter both fields or leave them both empty."
-#~ msgstr "Udfyld venligst begge felter eller lad dem begge være tomme."
-
-#~ msgid "This field must be given if %(field)s is %(value)s"
-#~ msgstr "Dette felt skal udfyldes, hvis %(field)s er lig %(value)s."
-
-#~ msgid "This field must be given if %(field)s is not %(value)s"
-#~ msgstr ""
-#~ "Dette felt skal udfyldes, hvis %(field)s er forskellig fra %(value)s."
-
-#~ msgid "Duplicate values are not allowed."
-#~ msgstr "Identiske værdier er ikke tilladt."
-
-#~ msgid "This value must be between %(lower)s and %(upper)s."
-#~ msgstr "Denne værdi skal være mellem %(lower)s og %(upper)s."
-
-#~ msgid "This value must be at least %s."
-#~ msgstr "Denne værdi skal være en mindst %s."
-
-#~ msgid "This value must be no more than %s."
-#~ msgstr "Denne værdi må højst være %s."
-
-#~ msgid "This value must be a power of %s."
-#~ msgstr "Denne værdi skal være en potens af %s."
-
-#~ msgid "Please enter a valid decimal number."
-#~ msgstr "Indtast venligst et gyldigt decimaltal."
-
-#~ msgid ""
-#~ "Please enter a valid decimal number with at most %s total digit.Please "
-#~ "enter a valid decimal number with at most %s total digits."
-#~ msgstr ""
-#~ "Indtast venligst et gyldigt decimaltal med %s ciffer.Indtast venligst et "
-#~ "gyldigt decimaltal med maksimalt %s cifre i alt."
-
-#~ msgid ""
-#~ "Please enter a valid decimal number with a whole part of at most %s digit."
-#~ "Please enter a valid decimal number with a whole part of at most %s "
-#~ "digits."
-#~ msgstr ""
-#~ "Indtast venligst et gyldigt decimaltal med en heltalsdel på %s cifre."
-#~ "Indtast venligst et gyldigt decimaltal med en heltalsdel på maksimalt %s "
-#~ "cifre."
-
-#~ msgid ""
-#~ "Please enter a valid decimal number with at most %s decimal place. Please "
-#~ "enter a valid decimal number with at most %s decimal places."
-#~ msgstr ""
-#~ "Indtast venligst et gyldigt decimaltal med %s cifre efter kommaet. "
-#~ "Indtast venligst et gyldigt decimaltal med maksimalt %s cifre efter "
-#~ "kommaet."
-
-#~ msgid "Please enter a valid floating point number."
-#~ msgstr "Indtast venligst et gyldigt flydende-komma-tal."
-
-#~ msgid "Make sure your uploaded file is at least %s bytes big."
-#~ msgstr "Kontroller, at den fil, du uploader, er på mindst %s bytes."
-
-#~ msgid "Make sure your uploaded file is at most %s bytes big."
-#~ msgstr "Kontroller, at den fil, du uploader, er på maksimalt %s bytes."
-
-#~ msgid "The format for this field is wrong."
-#~ msgstr "Formatet i dette felt er forkert."
-
-#~ msgid "This field is invalid."
-#~ msgstr "Dette felt er ugyldigt."
-
-#~ msgid "Could not retrieve anything from %s."
-#~ msgstr "Kunne ikke finde noget i %s."
-
-#~ msgid ""
-#~ "The URL %(url)s returned the invalid Content-Type header '%(contenttype)"
-#~ "s'."
-#~ msgstr ""
-#~ "URL'en %(url)s returnerede det ugyldige indholdstypehoved '%(contenttype)"
-#~ "s'."
-
-#~ msgid ""
-#~ "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts "
-#~ "with \"%(start)s\".)"
-#~ msgstr ""
-#~ "Luk venligst det uafsluttede tag %(tag)s fra linje %(line)s. (Linjen "
-#~ "starter med \"%(start)s\".)"
-
-#~ msgid ""
-#~ "Some text starting on line %(line)s is not allowed in that context. (Line "
-#~ "starts with \"%(start)s\".)"
-#~ msgstr ""
-#~ "Noget tekst, som starter på linje %(line)s, er ikke tilladt i den givne "
-#~ "sammenhæng. (Linjen starter med \"%(start)s\".)"
-
-#~ msgid ""
-#~ "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with "
-#~ "\"%(start)s\".)"
-#~ msgstr ""
-#~ "\"%(attr)s\" på linje %(line)s er ikke en gyldig attribut. (Linjen "
-#~ "starter med \"%(start)s\".)"
-
-#~ msgid ""
-#~ "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
-#~ "(start)s\".)"
-#~ msgstr ""
-#~ "\"<%(tag)s>\" på linje %(line)s er et ugyldigt tag. (Linjen starter med "
-#~ "\"%(start)s\".)"
-
-#~ msgid ""
-#~ "A tag on line %(line)s is missing one or more required attributes. (Line "
-#~ "starts with \"%(start)s\".)"
-#~ msgstr ""
-#~ "Et tag på linje %(line)s mangler en eller flere påkrævede attributter. "
-#~ "(Linjen starter med \"%(start)s\".)"
-
-#~ msgid ""
-#~ "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
-#~ "starts with \"%(start)s\".)"
-#~ msgstr ""
-#~ "Attributten \"%(attr)s\" på linje %(line)s har en ugyldig værdi. (Linjen "
-#~ "starter med \"%(start)s\".)"
-
-#~ msgid ""
-#~ "%(object)s with this %(type)s already exists for the given %(field)s."
-#~ msgstr ""
-#~ "%(object)s med denne %(type)s eksisterer allerede for den givne %(field)s."
-
-#~ msgid "Enter a valid filename."
-#~ msgstr "Indtast et gyldigt filnavn."
-
-#~ msgid "Please enter a valid %s."
-#~ msgstr "Indtast venligst en gyldig %s."
-
-#~ msgid "Ensure your text is less than %s character."
-#~ msgstr "Sørg for din tekst er kortere end %s tegn."
-
-#~ msgid "Line breaks are not allowed here."
-#~ msgstr "Linjeskift er ikke tilladt her."
-
-#~ msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-#~ msgstr "Markér et gyldigt valg; '%(data)s' er ikke i %(choices)s."
-
-#~ msgid "Enter a whole number between -32,768 and 32,767."
-#~ msgstr "Indtast et heltal mellem -32,768 og 32,767."
-
-#~ msgid "Enter a positive number."
-#~ msgstr "Indtast et positivt tal."
-
-#~ msgid "Enter a whole number between 0 and 32,767."
-#~ msgstr "Indtast et heltal mellem 0 og 32,767."
-
-#~ msgid "Added %s."
-#~ msgstr "Tilføjede %s."
-
-#~ msgid "Deleted %s."
-#~ msgstr "Slettede %s."
-
-#~ msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-#~ msgstr "Har du <a href=\"/password_reset/\">glemt din adgangskode</a>?"
-
-#~ msgid "Your new password is: %(new_password)s"
-#~ msgstr "Din nye adgangskode er: %(new_password)s"
-
-#~ msgid "Feel free to change this password by going to this page:"
-#~ msgstr "Du kan ændre din adgangskode ved at gå til denne side:"
-
-#~ msgid "Use '[algo]$[salt]$[hexdigest]'"
-#~ msgstr "Brug '[algo]$[salt]$[hexdigest]'"
-
-#~ msgid "Separate multiple IDs with commas."
-#~ msgstr "Adskil flere ID'er med kommaer."
diff --git a/django/conf/locale/et/LC_MESSAGES/django.mo b/django/conf/locale/et/LC_MESSAGES/django.mo
index f2fef35f52..426ee9c937 100644
Binary files a/django/conf/locale/et/LC_MESSAGES/django.mo and b/django/conf/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/et/LC_MESSAGES/django.po b/django/conf/locale/et/LC_MESSAGES/django.po
index 6d9b9e41e2..9b8ae9e27a 100644
--- a/django/conf/locale/et/LC_MESSAGES/django.po
+++ b/django/conf/locale/et/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 07:53+0300\n"
+"POT-Creation-Date: 2009-07-24 22:06+0300\n"
 "PO-Revision-Date: 2008-09-03 00:35+0200\n"
 "Last-Translator: Erik Allik <removethis-eallik_at_gmail-com>\n"
 "Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
@@ -217,19 +217,19 @@ msgstr "lihtsustatud hiina"
 msgid "Traditional Chinese"
 msgstr "traditsiooniline hiina"
 
-#: contrib/admin/actions.py:56
+#: contrib/admin/actions.py:60
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
-msgstr ""
+msgstr "%(count)d %(items)s kustutamine õnnestus"
 
-#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
 msgid "Are you sure?"
 msgstr "Kas olete kindel?"
 
-#: contrib/admin/actions.py:81
+#: contrib/admin/actions.py:85
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
-msgstr ""
+msgstr "Kustuta valitud %(verbose_name_plural)s"
 
 #: contrib/admin/filterspecs.py:44
 #, python-format
@@ -265,15 +265,15 @@ msgstr "Käesolev kuu"
 msgid "This year"
 msgstr "Käesolev aasta"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
 msgid "Yes"
 msgstr "Jah"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
 msgid "No"
 msgstr "Ei"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
 msgid "Unknown"
 msgstr "Tundmatu"
 
@@ -311,100 +311,101 @@ msgstr "logisissekanded"
 
 #: contrib/admin/options.py:133 contrib/admin/options.py:147
 msgid "None"
-msgstr "puudub"
+msgstr "Puudub"
 
-#: contrib/admin/options.py:517
+#: contrib/admin/options.py:519
 #, python-format
 msgid "Changed %s."
 msgstr "Muutsin %s."
 
-#: contrib/admin/options.py:517 contrib/admin/options.py:527
-#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
+#: contrib/admin/options.py:519 contrib/admin/options.py:529
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
+#: forms/models.py:600
 msgid "and"
 msgstr "ja"
 
-#: contrib/admin/options.py:522
+#: contrib/admin/options.py:524
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Lisatud %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:526
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Muudetud %(list)s objektil %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:531
+#: contrib/admin/options.py:533
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Kustutatud %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:535
+#: contrib/admin/options.py:537
 msgid "No fields changed."
 msgstr "Ühtegi välja ei muudetud."
 
-#: contrib/admin/options.py:596 contrib/auth/admin.py:67
+#: contrib/admin/options.py:599 contrib/auth/admin.py:67
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" lisamine õnnestus."
 
-#: contrib/admin/options.py:600 contrib/admin/options.py:633
+#: contrib/admin/options.py:603 contrib/admin/options.py:636
 #: contrib/auth/admin.py:75
 msgid "You may edit it again below."
 msgstr "Võite jätkata redigeerimist."
 
-#: contrib/admin/options.py:610 contrib/admin/options.py:643
+#: contrib/admin/options.py:613 contrib/admin/options.py:646
 #, python-format
 msgid "You may add another %s below."
 msgstr "Võite jätkata uue %s lisamisega."
 
-#: contrib/admin/options.py:631
+#: contrib/admin/options.py:634
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" muutmine õnnestus."
 
-#: contrib/admin/options.py:639
+#: contrib/admin/options.py:642
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" lisamine õnnestus. Te võite seda muuta."
 
-#: contrib/admin/options.py:770
+#: contrib/admin/options.py:773
 #, python-format
 msgid "Add %s"
 msgstr "Lisa %s"
 
-#: contrib/admin/options.py:801 contrib/admin/options.py:1001
+#: contrib/admin/options.py:804 contrib/admin/options.py:1005
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s primaarvõtmega %(key)r ei eksisteeri."
 
-#: contrib/admin/options.py:858
+#: contrib/admin/options.py:861
 #, python-format
 msgid "Change %s"
 msgstr "Muuda %s"
 
-#: contrib/admin/options.py:902
+#: contrib/admin/options.py:905
 msgid "Database error"
 msgstr "Andmebaasi viga"
 
-#: contrib/admin/options.py:938
+#: contrib/admin/options.py:941
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s muutmine õnnestus."
 msgstr[1] "%(count)s %(name)s muutmine õnnestus."
 
-#: contrib/admin/options.py:1016
+#: contrib/admin/options.py:1020
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" kustutati."
 
-#: contrib/admin/options.py:1052
+#: contrib/admin/options.py:1057
 #, python-format
 msgid "Change history: %s"
 msgstr "Muudatuste ajalugu: %s"
 
-#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
 #: contrib/auth/forms.py:80
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
@@ -413,11 +414,11 @@ msgstr ""
 "Palun sisestage korrektne kasutajatunnus ja salasõna. Mõlemad väljad on "
 "tõstutundlikud."
 
-#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Teie sessioon on aegunud. Palun logige uuesti sisse."
 
-#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -425,28 +426,27 @@ msgstr ""
 "Paistab, et Teie brauser ei aktsepteeri küpsiseid. Palun võimaldage küpsised "
 "ning seejärel laadige see leht uuesti."
 
-#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
+#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Kasutajatunnused ei tohi sisaldada '@' märki."
 
-#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Teie e-posti aadress ei ole Teie kasutajatunnus. Proovige '%s'."
+msgstr "Teie e-posti aadress ei ole Teie kasutajatunnus. Proovige '%s'."
 
-#: contrib/admin/sites.py:360
+#: contrib/admin/sites.py:367
 msgid "Site administration"
 msgstr "Saidi administreerimine"
 
-#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "Sisene"
 
-#: contrib/admin/sites.py:417
+#: contrib/admin/sites.py:426
 #, python-format
 msgid "%s administration"
 msgstr "%s - administreerimine"
@@ -496,7 +496,7 @@ msgstr "Vabandame, kuid soovitud lehte ei leitud."
 
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:33
+#: contrib/admin/templates/admin/base.html:54
 #: contrib/admin/templates/admin/change_form.html:17
 #: contrib/admin/templates/admin/change_list.html:25
 #: contrib/admin/templates/admin/delete_confirmation.html:6
@@ -541,7 +541,6 @@ msgid "Run the selected action"
 msgstr "Käivita valitud toiming"
 
 #: contrib/admin/templates/admin/actions.html:4
-#: contrib/admin/templates/admin/search_form.html:8
 msgid "Go"
 msgstr "Mine"
 
@@ -551,18 +550,18 @@ msgstr "Mine"
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:27
 msgid "Welcome,"
 msgstr "Tere tulemast,"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:32
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:40
 #: contrib/admin/templates/admin/auth/user/change_password.html:14
 #: contrib/admin/templates/admin/auth/user/change_password.html:47
 #: contrib/admin/templates/registration/password_change_done.html:3
@@ -570,7 +569,7 @@ msgstr "Dokumentatsioon"
 msgid "Change password"
 msgstr "Muuda salasõna"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:47
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Log out"
@@ -659,9 +658,8 @@ msgid ""
 "your account doesn't have permission to delete the following types of "
 "objects:"
 msgstr ""
-"%(object_name)s kustutamiseks on vaja "
-"kustutada ka seotud objektid, aga teil puudub õigus järgnevat "
-"tüüpi objektide kustutamiseks:"
+"%(object_name)s kustutamiseks on vaja kustutada ka seotud objektid, aga teil "
+"puudub õigus järgnevat tüüpi objektide kustutamiseks:"
 
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:22
 #, python-format
@@ -702,6 +700,10 @@ msgstr "Minu Toimingud"
 msgid "None available"
 msgstr "Ei leitud ühtegi"
 
+#: contrib/admin/templates/admin/index.html:72
+msgid "Unknown content"
+msgstr "Tundmatu sisu"
+
 #: contrib/admin/templates/admin/invalid_setup.html:7
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
@@ -750,6 +752,15 @@ msgstr ""
 msgid "Show all"
 msgstr "Näita kõiki"
 
+#: contrib/admin/templates/admin/pagination.html:11
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Salvesta"
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Search"
+msgstr "Otsing"
+
 #: contrib/admin/templates/admin/search_form.html:10
 #, python-format
 msgid "1 result"
@@ -762,10 +773,6 @@ msgstr[1] "%(counter)s tulemust"
 msgid "%(full_result_count)s total"
 msgstr "Kokku %(full_result_count)s"
 
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Save"
-msgstr "Salvesta"
-
 #: contrib/admin/templates/admin/submit_line.html:5
 msgid "Save as new"
 msgstr "Salvesta uuena"
@@ -993,144 +1000,145 @@ msgstr "sait"
 msgid "template"
 msgstr "mall"
 
-#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
-#: contrib/admindocs/views.py:62
+#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
+#: contrib/admindocs/views.py:65
 msgid "tag:"
 msgstr "lipik:"
 
-#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
-#: contrib/admindocs/views.py:95
+#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
+#: contrib/admindocs/views.py:98
 msgid "filter:"
 msgstr "filtreeri:"
 
-#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
-#: contrib/admindocs/views.py:159
+#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
+#: contrib/admindocs/views.py:162
 msgid "view:"
 msgstr "vaade:"
 
-#: contrib/admindocs/views.py:187
+#: contrib/admindocs/views.py:190
 #, python-format
 msgid "App %r not found"
 msgstr "Rakendust %r ei leitud"
 
-#: contrib/admindocs/views.py:194
+#: contrib/admindocs/views.py:197
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Mudelit %(model_name)r ei leitud rakendusest %(app_label)r"
 
-#: contrib/admindocs/views.py:206
+#: contrib/admindocs/views.py:209
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "seotud `%(app_label)s.%(data_type)s` objekt"
 
-#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
-#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
 msgid "model:"
 msgstr "mudel:"
 
-#: contrib/admindocs/views.py:237
+#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "seotud `%(app_label)s.%(object_name)s` objektid"
 
-#: contrib/admindocs/views.py:242
+#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
 #, python-format
 msgid "all %s"
 msgstr "kõik %s"
 
-#: contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
 #, python-format
 msgid "number of %s"
 msgstr "%s arv"
 
-#: contrib/admindocs/views.py:252
+#: contrib/admindocs/views.py:271
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Objekti %s väljad"
 
-#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
-#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
-#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
+#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
+#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
+#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
 msgid "Integer"
 msgstr "Täisarv"
 
-#: contrib/admindocs/views.py:316
+#: contrib/admindocs/views.py:335
 msgid "Boolean (Either True or False)"
 msgstr "Tõeväärtus (Kas tõene või väär)"
 
-#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "String (kuni %(max_length)s märki)"
 
-#: contrib/admindocs/views.py:318
+#: contrib/admindocs/views.py:337
 msgid "Comma-separated integers"
 msgstr "Komaga eraldatud täisarvud"
 
-#: contrib/admindocs/views.py:319
+#: contrib/admindocs/views.py:338
 msgid "Date (without time)"
 msgstr "Kuupäev (kellaajata)"
 
-#: contrib/admindocs/views.py:320
+#: contrib/admindocs/views.py:339
 msgid "Date (with time)"
 msgstr "Kuupäev (kellaajaga)"
 
-#: contrib/admindocs/views.py:321
+#: contrib/admindocs/views.py:340
 msgid "Decimal number"
 msgstr "Kümnendmurd"
 
-#: contrib/admindocs/views.py:322
+#: contrib/admindocs/views.py:341
 msgid "E-mail address"
 msgstr "E-posti aadress"
 
-#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
-#: contrib/admindocs/views.py:327
+#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
+#: contrib/admindocs/views.py:346
 msgid "File path"
 msgstr "Faili asukoht"
 
-#: contrib/admindocs/views.py:325
+#: contrib/admindocs/views.py:344
 msgid "Floating point number"
 msgstr "Ujukomaarv"
 
-#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
+#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
 msgid "IP address"
 msgstr "IP aadress"
 
-#: contrib/admindocs/views.py:331
+#: contrib/admindocs/views.py:350
 msgid "Boolean (Either True, False or None)"
 msgstr "Tõeväärtus (Kas tõene, väär või tühi)"
 
-#: contrib/admindocs/views.py:332
+#: contrib/admindocs/views.py:351
 msgid "Relation to parent model"
 msgstr "Seos ülem-mudeliga"
 
-#: contrib/admindocs/views.py:333
+#: contrib/admindocs/views.py:352
 msgid "Phone number"
 msgstr "Telefoninumber"
 
-#: contrib/admindocs/views.py:338
+#: contrib/admindocs/views.py:357
 msgid "Text"
 msgstr "Tekst"
 
-#: contrib/admindocs/views.py:339
+#: contrib/admindocs/views.py:358
 msgid "Time"
 msgstr "Aeg"
 
-#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
+#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
 #: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "URL"
 
-#: contrib/admindocs/views.py:341
+#: contrib/admindocs/views.py:360
 msgid "U.S. state (two uppercase letters)"
 msgstr "U.S.A. osariik (kaks suurt tähte)"
 
-#: contrib/admindocs/views.py:342
+#: contrib/admindocs/views.py:361
 msgid "XML text"
 msgstr "XML tekst"
 
-#: contrib/admindocs/views.py:368
+#: contrib/admindocs/views.py:387
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ei tundu olevat urlpattern objekt"
@@ -1470,7 +1478,7 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Kui sisestate sellesse lahtrisse midagi, loetakse kommentaar rämpsuks"
 
-#: contrib/comments/models.py:22 contrib/contenttypes/models.py:71
+#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
 msgid "content type"
 msgstr "sisutüüp"
 
@@ -1698,11 +1706,11 @@ msgstr "Postita kommentaar"
 msgid "or make changes"
 msgstr "või tee muudatused"
 
-#: contrib/contenttypes/models.py:67
+#: contrib/contenttypes/models.py:70
 msgid "python model class name"
 msgstr "pythoni mudeli klassinimi"
 
-#: contrib/contenttypes/models.py:72
+#: contrib/contenttypes/models.py:75
 msgid "content types"
 msgstr "sisutüübid"
 
@@ -1772,18 +1780,25 @@ msgstr ""
 "Vabandame, kuid vorm on aegunud. Palun jätkake vormi täitmist käesolevalt "
 "lehelt."
 
-#: contrib/gis/forms/fields.py:14
+#: contrib/gis/forms/fields.py:17
 msgid "No geometry value provided."
 msgstr "Geomeetriline väärtus puudub."
 
-#: contrib/gis/forms/fields.py:15
+#: contrib/gis/forms/fields.py:18
 msgid "Invalid geometry value."
 msgstr "Vigane geomeetriline väärtus."
 
-#: contrib/gis/forms/fields.py:16
+#: contrib/gis/forms/fields.py:19
 msgid "Invalid geometry type."
 msgstr "Vigane geomeetriline tüüp."
 
+#: contrib/gis/forms/fields.py:20
+msgid ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
+msgstr ""
+"Geomeetria teisendamisel geomeetria vormivälja SRID-ks tekkis viga."
+
 #: contrib/humanize/templatetags/humanize.py:19
 msgid "th"
 msgstr "."
@@ -2104,59 +2119,59 @@ msgstr "Tšiili RUT on ebakorrektne."
 
 #: contrib/localflavor/cz/cz_regions.py:8
 msgid "Prague"
-msgstr ""
+msgstr "Praha"
 
 #: contrib/localflavor/cz/cz_regions.py:9
 msgid "Central Bohemian Region"
-msgstr ""
+msgstr "Kesk-Boheemia regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:10
 msgid "South Bohemian Region"
-msgstr ""
+msgstr "Lõuna-Boheemia regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:11
 msgid "Pilsen Region"
-msgstr ""
+msgstr "Pilseni regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:12
 msgid "Carlsbad Region"
-msgstr ""
+msgstr "Carlsbadi regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:13
 msgid "Usti Region"
-msgstr ""
+msgstr "Usti regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:14
 msgid "Liberec Region"
-msgstr ""
+msgstr "Libereci regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:15
 msgid "Hradec Region"
-msgstr ""
+msgstr "Hradeci regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:16
 msgid "Pardubice Region"
-msgstr ""
+msgstr "Pardubice regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:17
 msgid "Vysocina Region"
-msgstr ""
+msgstr "Vysocina regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:18
 msgid "South Moravian Region"
-msgstr ""
+msgstr "Lõuna-Moraavia regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:19
 msgid "Olomouc Region"
-msgstr ""
+msgstr "Olomouci regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:20
 msgid "Zlin Region"
-msgstr ""
+msgstr "Zlini regioon"
 
 #: contrib/localflavor/cz/cz_regions.py:21
 msgid "Moravian-Silesian Region"
-msgstr ""
+msgstr "Moraavia-Sileesia regioon"
 
 #: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30
 msgid "Enter a postal code in the format XXXXX or XXX XX."
@@ -2164,12 +2179,13 @@ msgstr "Sisesta postiindeks kujul XXXXX või XXX XX."
 
 #: contrib/localflavor/cz/forms.py:47
 msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Sisesta sünninumber formaadis XXXXXX/XXXX või XXXXXXXXXX"
+msgstr "Sisesta sünninumber formaadis XXXXXX/XXXX või XXXXXXXXXX"
 
 #: contrib/localflavor/cz/forms.py:48
 msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Ebasobiv valikuline parameeter Sugu, sobivad väärtused on 'f' (naine) ja 'm' (mees)"
+msgstr ""
+"Ebasobiv valikuline parameeter Sugu, sobivad väärtused on 'f' (naine) ja "
+"'m' (mees)"
 
 #: contrib/localflavor/cz/forms.py:49
 msgid "Enter a valid birth number."
@@ -3846,7 +3862,7 @@ msgstr "hüüdnimi"
 msgid "sites"
 msgstr "saidid"
 
-#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
 msgid "This value must be an integer."
 msgstr "See väärtus peab olema täisarv."
 
@@ -3880,24 +3896,24 @@ msgstr ""
 msgid "This value must be a decimal number."
 msgstr "See väärtus peab olema kümnendarv."
 
-#: db/models/fields/__init__.py:683
+#: db/models/fields/__init__.py:686
 msgid "This value must be a float."
 msgstr "See väärtus peab olema murdarv."
 
-#: db/models/fields/__init__.py:743
+#: db/models/fields/__init__.py:746
 msgid "This value must be either None, True or False."
 msgstr "See väärtus peab olema kas tühi, tõene või väär."
 
-#: db/models/fields/__init__.py:846 db/models/fields/__init__.py:860
+#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "Sisestage korrektne kellaaeg formaadis TT:MM[:ss[.uuuuuu]]"
 
-#: db/models/fields/related.py:792
+#: db/models/fields/related.py:816
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "Et valida mitu, hoidke all \"Control\"-nuppu (Maci puhul \"Command\")."
 
-#: db/models/fields/related.py:870
+#: db/models/fields/related.py:894
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -3961,11 +3977,11 @@ msgstr "Veenduge, et komakohtade arv ei ületaks %s."
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Veenduge, et komast vasakul olevaid numbreid ei oleks rohkem kui %s."
 
-#: forms/fields.py:288 forms/fields.py:862
+#: forms/fields.py:288 forms/fields.py:863
 msgid "Enter a valid date."
 msgstr "Sisestage korrektne kuupäev."
 
-#: forms/fields.py:322 forms/fields.py:863
+#: forms/fields.py:322 forms/fields.py:864
 msgid "Enter a valid time."
 msgstr "Sisestage korrektne kellaaeg."
 
@@ -4009,20 +4025,20 @@ msgstr "Sisestage korrektne URL."
 msgid "This URL appears to be a broken link."
 msgstr "See URL näib olevat katkine."
 
-#: forms/fields.py:624 forms/fields.py:702
+#: forms/fields.py:625 forms/fields.py:703
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "Valige korrektne väärtus. %(value)s ei ole valitav."
 
-#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
+#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
 msgid "Enter a list of values."
 msgstr "Sisestage väärtuste nimekiri."
 
-#: forms/fields.py:891
+#: forms/fields.py:892
 msgid "Enter a valid IPv4 address."
 msgstr "Sisestage korrektne IPv4 aadress."
 
-#: forms/fields.py:901
+#: forms/fields.py:902
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@@ -4032,76 +4048,103 @@ msgstr ""
 msgid "Order"
 msgstr "Järjestus"
 
-#: forms/models.py:299 forms/models.py:308
+#: forms/models.py:367
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr "%(field_name)s peab olema unikaalne %(date_field)s %(lookup)s suhtes."
+
+#: forms/models.py:381 forms/models.py:389
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "Sellise %(field_label)s-väljaga %(model_name)s on juba olemas."
 
-#: forms/models.py:651
-msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+#: forms/models.py:594
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Palun parandage duplikaat-andmed lahtris %(field)s."
 
-#: forms/models.py:706
+#: forms/models.py:598
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr "Palun parandage duplikaat-andmed lahtris %(field)s, mis peab olema unikaalne."
+
+#: forms/models.py:604
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+""
+
+#: forms/models.py:612
+msgid "Please correct the duplicate values below."
+msgstr "Palun parandage allolevad duplikaat-väärtused"
+
+#: forms/models.py:867
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr "Pesastatud välisvõti ei sobi ülemobjekti primaarvõtmega."
+
+#: forms/models.py:930
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Valige korrektne väärtus. Valitud väärtus ei ole valitav."
 
-#: forms/models.py:777
+#: forms/models.py:1004
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Valige korrektne väärtus. %s ei ole valitav."
 
-#: forms/models.py:779
+#: forms/models.py:1006
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" ei ole sobiv väärtust primaarvõtmeks."
 
-#: template/defaultfilters.py:765
+#: template/defaultfilters.py:767
 msgid "yes,no,maybe"
 msgstr "jah,ei,võib-olla"
 
-#: template/defaultfilters.py:796
+#: template/defaultfilters.py:798
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bait"
 msgstr[1] "%(size)d baiti"
 
-#: template/defaultfilters.py:798
+#: template/defaultfilters.py:800
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:800
+#: template/defaultfilters.py:802
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:801
+#: template/defaultfilters.py:803
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: utils/dateformat.py:41
+#: utils/dateformat.py:42
 msgid "p.m."
 msgstr "p.l."
 
-#: utils/dateformat.py:42
+#: utils/dateformat.py:43
 msgid "a.m."
 msgstr "e.l."
 
-#: utils/dateformat.py:47
+#: utils/dateformat.py:48
 msgid "PM"
 msgstr "PL"
 
-#: utils/dateformat.py:48
+#: utils/dateformat.py:49
 msgid "AM"
 msgstr "EL"
 
-#: utils/dateformat.py:97
+#: utils/dateformat.py:98
 msgid "midnight"
 msgstr "südaöö"
 
-#: utils/dateformat.py:99
+#: utils/dateformat.py:100
 msgid "noon"
 msgstr "keskpäev"
 
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index cad80c1f91..f4b5a08101 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 5ab3cd1fa9..22145a2fb5 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-10 08:26+0200\n"
-"PO-Revision-Date: 2009-04-10 08:29+0200\n"
+"POT-Creation-Date: 2009-07-27 11:12+0200\n"
+"PO-Revision-Date: 2009-07-27 11:10+0200\n"
 "Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
-"Language-Team: Italian\n"
+"Language-Team: Italian <django-it@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
 
 #: conf/global_settings.py:44
 msgid "Arabic"
@@ -202,7 +202,7 @@ msgstr "telugu"
 
 #: conf/global_settings.py:90
 msgid "Thai"
-msgstr "thai"
+msgstr "tailandese"
 
 #: conf/global_settings.py:91
 msgid "Turkish"
@@ -220,19 +220,19 @@ msgstr "cinese semplificato"
 msgid "Traditional Chinese"
 msgstr "cinese tradizionale"
 
-#: contrib/admin/actions.py:56
+#: contrib/admin/actions.py:60
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
-msgstr "Cancellati con successo %(count)d %(items)s."
+msgstr "Cancellati/e con successo %(count)d %(items)s."
 
-#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
 msgid "Are you sure?"
 msgstr "Sei sicuro?"
 
-#: contrib/admin/actions.py:81
+#: contrib/admin/actions.py:85
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
-msgstr "Cancellati i %(verbose_name_plural)s selezionati"
+msgstr "Cancella %(verbose_name_plural)s selezionati/e"
 
 #: contrib/admin/filterspecs.py:44
 #, python-format
@@ -268,15 +268,15 @@ msgstr "Questo mese"
 msgid "This year"
 msgstr "Quest'anno"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
 msgid "Yes"
 msgstr "Sì"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
 msgid "No"
 msgstr "No"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -316,99 +316,100 @@ msgstr "voci di log"
 msgid "None"
 msgstr "Nessuno"
 
-#: contrib/admin/options.py:517
+#: contrib/admin/options.py:519
 #, python-format
 msgid "Changed %s."
-msgstr "%s modificato."
+msgstr "%s modificato/a."
 
-#: contrib/admin/options.py:517 contrib/admin/options.py:527
-#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
+#: contrib/admin/options.py:519 contrib/admin/options.py:529
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
+#: forms/models.py:600
 msgid "and"
 msgstr "e"
 
-#: contrib/admin/options.py:522
+#: contrib/admin/options.py:524
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
-msgstr "Aggiunti %(name)s \"%(object)s\"."
+msgstr "Aggiunto/a %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:526
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
-msgstr "Cambiati %(list)s per %(name)s \"%(object)s\"."
+msgstr "Cambiato/i %(list)s per %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:531
+#: contrib/admin/options.py:533
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
-msgstr "Cancellati %(name)s \"%(object)s\"."
+msgstr "Cancellato/a %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:535
+#: contrib/admin/options.py:537
 msgid "No fields changed."
 msgstr "Nessun campo modificato."
 
-#: contrib/admin/options.py:596 contrib/auth/admin.py:67
+#: contrib/admin/options.py:599 contrib/auth/admin.py:67
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" è stato aggiunto correttamente."
+msgstr "%(name)s \"%(obj)s\" aggiunto/a correttamente."
 
-#: contrib/admin/options.py:600 contrib/admin/options.py:633
+#: contrib/admin/options.py:603 contrib/admin/options.py:636
 #: contrib/auth/admin.py:75
 msgid "You may edit it again below."
-msgstr "È possibile modificarlo nuovamente qui sotto."
+msgstr "È possibile modificare nuovamente qui sotto."
 
-#: contrib/admin/options.py:610 contrib/admin/options.py:643
+#: contrib/admin/options.py:613 contrib/admin/options.py:646
 #, python-format
 msgid "You may add another %s below."
-msgstr "Puoi aggiungere un altro %s qui sotto."
+msgstr "Puoi aggiungere un altro/a %s qui sotto."
 
-#: contrib/admin/options.py:631
+#: contrib/admin/options.py:634
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" modificato correttamente."
+msgstr "%(name)s \"%(obj)s\" modificato/a correttamente."
 
-#: contrib/admin/options.py:639
+#: contrib/admin/options.py:642
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
-"%(name)s \"%(obj)s\" aggiunto correttamente. Puoi modificarlo ancora qui "
+"%(name)s \"%(obj)s\" aggiunto/a correttamente. Puoi modificare ancora qui "
 "sotto."
 
-#: contrib/admin/options.py:770
+#: contrib/admin/options.py:773
 #, python-format
 msgid "Add %s"
 msgstr "Aggiungi %s"
 
-#: contrib/admin/options.py:801 contrib/admin/options.py:1001
+#: contrib/admin/options.py:804 contrib/admin/options.py:1005
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "L'oggetto %(name)s con chiave primaria %(key)r non esiste."
 
-#: contrib/admin/options.py:858
+#: contrib/admin/options.py:861
 #, python-format
 msgid "Change %s"
 msgstr "Modifica %s"
 
-#: contrib/admin/options.py:902
+#: contrib/admin/options.py:905
 msgid "Database error"
 msgstr "Errore nel database"
 
-#: contrib/admin/options.py:938
+#: contrib/admin/options.py:941
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
-msgstr[0] "%(count)s %(name)s è stato modificato correttamente."
-msgstr[1] "%(count)s %(name)s sono stati modificati correttamente."
+msgstr[0] "%(count)s %(name)s modificato/a correttamente."
+msgstr[1] "%(count)s %(name)s modificati/e correttamente."
 
-#: contrib/admin/options.py:1016
+#: contrib/admin/options.py:1020
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" cancellato correttamente."
+msgstr "%(name)s \"%(obj)s\" cancellato/a correttamente."
 
-#: contrib/admin/options.py:1052
+#: contrib/admin/options.py:1057
 #, python-format
 msgid "Change history: %s"
 msgstr "Tracciato delle modifiche: %s"
 
-#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
 #: contrib/auth/forms.py:80
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
@@ -417,11 +418,11 @@ msgstr ""
 "Inserisci nome utente e password corretti. In entrambi i campi le maiuscole "
 "sono significative."
 
-#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Effettua di nuovo l'accesso, perché la tua sessione è scaduta."
 
-#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -429,27 +430,27 @@ msgstr ""
 "Il browser non sembra configurato per accettare i cookie. Una volta "
 "abilitati, ricarica la pagina e riprova."
 
-#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
+#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "I nomi utente non possono contenere il carattere '@'."
 
-#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Il nome utente non è costituito dall'indirizzo e-mail. Prova con '%s'."
 
-#: contrib/admin/sites.py:360
+#: contrib/admin/sites.py:367
 msgid "Site administration"
 msgstr "Amministrazione sito"
 
-#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "Accedi"
 
-#: contrib/admin/sites.py:417
+#: contrib/admin/sites.py:426
 #, python-format
 msgid "%s administration"
 msgstr "Amministrazione %s"
@@ -499,7 +500,7 @@ msgstr "Spiacenti, ma la pagina richiesta non è stata trovata."
 
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:33
+#: contrib/admin/templates/admin/base.html:54
 #: contrib/admin/templates/admin/change_form.html:17
 #: contrib/admin/templates/admin/change_list.html:25
 #: contrib/admin/templates/admin/delete_confirmation.html:6
@@ -535,7 +536,8 @@ 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 ""
-"Si è verificato un errore. È stato riportato agli amministratori del sito "
+"Si è verificato un errore. Gli amministratori del sito ne sono stati "
+"informati"
 "via e-mail e verrà corretto a breve. Grazie per la tua pazienza."
 
 #: contrib/admin/templates/admin/actions.html:4
@@ -543,7 +545,6 @@ msgid "Run the selected action"
 msgstr "Esegui l'azione selezionata"
 
 #: contrib/admin/templates/admin/actions.html:4
-#: contrib/admin/templates/admin/search_form.html:8
 msgid "Go"
 msgstr "Vai"
 
@@ -553,18 +554,18 @@ msgstr "Vai"
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:27
 msgid "Welcome,"
-msgstr "Benvenuto,"
+msgstr "Benvenuto/a,"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:32
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:40
 #: contrib/admin/templates/admin/auth/user/change_password.html:14
 #: contrib/admin/templates/admin/auth/user/change_password.html:47
 #: contrib/admin/templates/registration/password_change_done.html:3
@@ -572,7 +573,7 @@ msgstr "Documentazione"
 msgid "Change password"
 msgstr "Cambia la password"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:47
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Log out"
@@ -607,7 +608,7 @@ msgstr "Vedi sul sito"
 #: contrib/admin/templates/admin/auth/user/change_password.html:23
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
-msgstr[0] "Correggi gli errori qui sotto."
+msgstr[0] "Correggi l'errore qui sotto."
 msgstr[1] "Correggi gli errori qui sotto."
 
 #: contrib/admin/templates/admin/change_list.html:46
@@ -703,6 +704,10 @@ msgstr "Azioni Proprie"
 msgid "None available"
 msgstr "Nessuna disponibile"
 
+#: contrib/admin/templates/admin/index.html:72
+msgid "Unknown content"
+msgstr "Contenuto sconosciuto"
+
 #: contrib/admin/templates/admin/invalid_setup.html:7
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
@@ -751,6 +756,15 @@ msgstr ""
 msgid "Show all"
 msgstr "Mostra tutto"
 
+#: contrib/admin/templates/admin/pagination.html:11
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Salva"
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Search"
+msgstr "Cerca"
+
 #: contrib/admin/templates/admin/search_form.html:10
 #, python-format
 msgid "1 result"
@@ -763,10 +777,6 @@ msgstr[1] "%(counter)s risultati"
 msgid "%(full_result_count)s total"
 msgstr "%(full_result_count)s totali"
 
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Save"
-msgstr "Salva"
-
 #: contrib/admin/templates/admin/submit_line.html:5
 msgid "Save as new"
 msgstr "Salva come nuovo"
@@ -836,7 +846,7 @@ msgstr "Cambio password"
 #: contrib/admin/templates/registration/password_change_done.html:6
 #: contrib/admin/templates/registration/password_change_done.html:10
 msgid "Password change successful"
-msgstr "Cambio di password avvenuto correttamente"
+msgstr "Cambio password avvenuto correttamente"
 
 #: contrib/admin/templates/registration/password_change_done.html:12
 msgid "Your password was changed."
@@ -905,7 +915,7 @@ msgstr ""
 
 #: contrib/admin/templates/registration/password_reset_confirm.html:26
 msgid "Password reset unsuccessful"
-msgstr "Password NON reimpostata"
+msgstr "Password non reimpostata"
 
 #: contrib/admin/templates/registration/password_reset_confirm.html:28
 msgid ""
@@ -943,7 +953,7 @@ msgstr "Vai alla pagina seguente e scegli una nuova password:"
 
 #: contrib/admin/templates/registration/password_reset_email.html:9
 msgid "Your username, in case you've forgotten:"
-msgstr "Il tuo nome utente, in caso l'abbia dimenticato:"
+msgstr "Il tuo nome utente, in caso tu l'abbia dimenticato:"
 
 #: contrib/admin/templates/registration/password_reset_email.html:11
 msgid "Thanks for using our site!"
@@ -959,7 +969,7 @@ msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll e-mail "
 "instructions for setting a new one."
 msgstr ""
-"Dimenticata la password? Inserisci il tuo indirizzo email qui sotto, e ti "
+"Password dimenticata? Inserisci il tuo indirizzo email qui sotto, e ti "
 "invieremo per email le istruzioni per impostarne una nuova."
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
@@ -992,144 +1002,145 @@ msgstr "sito"
 msgid "template"
 msgstr "modello"
 
-#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
-#: contrib/admindocs/views.py:62
+#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
+#: contrib/admindocs/views.py:65
 msgid "tag:"
 msgstr "tag:"
 
-#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
-#: contrib/admindocs/views.py:95
+#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
+#: contrib/admindocs/views.py:98
 msgid "filter:"
 msgstr "filtro:"
 
-#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
-#: contrib/admindocs/views.py:159
+#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
+#: contrib/admindocs/views.py:162
 msgid "view:"
 msgstr "view:"
 
-#: contrib/admindocs/views.py:187
+#: contrib/admindocs/views.py:190
 #, python-format
 msgid "App %r not found"
 msgstr "Appl. %r non trovata"
 
-#: contrib/admindocs/views.py:194
+#: contrib/admindocs/views.py:197
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modello %(model_name)r non trovato nell'appl. %(app_label)r"
 
-#: contrib/admindocs/views.py:206
+#: contrib/admindocs/views.py:209
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "l'oggetto `%(app_label)s.%(data_type)s` collegato"
 
-#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
-#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
 msgid "model:"
 msgstr "modello:"
 
-#: contrib/admindocs/views.py:237
+#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "oggetti `%(app_label)s.%(object_name)s` collegati"
 
-#: contrib/admindocs/views.py:242
+#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
 #, python-format
 msgid "all %s"
 msgstr "tutti %s"
 
-#: contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
 #, python-format
 msgid "number of %s"
 msgstr "numero di %s"
 
-#: contrib/admindocs/views.py:252
+#: contrib/admindocs/views.py:271
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Campi sugli oggetti %s"
 
-#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
-#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
-#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
+#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
+#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
+#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
 msgid "Integer"
 msgstr "Intero"
 
-#: contrib/admindocs/views.py:316
+#: contrib/admindocs/views.py:335
 msgid "Boolean (Either True or False)"
 msgstr "Booleano (True o False)"
 
-#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Stringa (fino a %(max_length)s)"
 
-#: contrib/admindocs/views.py:318
+#: contrib/admindocs/views.py:337
 msgid "Comma-separated integers"
 msgstr "Interi separati da virgola"
 
-#: contrib/admindocs/views.py:319
+#: contrib/admindocs/views.py:338
 msgid "Date (without time)"
 msgstr "Data (senza ora)"
 
-#: contrib/admindocs/views.py:320
+#: contrib/admindocs/views.py:339
 msgid "Date (with time)"
 msgstr "Data (con ora)"
 
-#: contrib/admindocs/views.py:321
+#: contrib/admindocs/views.py:340
 msgid "Decimal number"
 msgstr "Numero decimale"
 
-#: contrib/admindocs/views.py:322
+#: contrib/admindocs/views.py:341
 msgid "E-mail address"
 msgstr "Indirizzo e-mail"
 
-#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
-#: contrib/admindocs/views.py:327
+#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
+#: contrib/admindocs/views.py:346
 msgid "File path"
 msgstr "Percorso di file"
 
-#: contrib/admindocs/views.py:325
+#: contrib/admindocs/views.py:344
 msgid "Floating point number"
 msgstr "Numero decimale"
 
-#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
+#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
 msgid "IP address"
 msgstr "indirizzo IP"
 
-#: contrib/admindocs/views.py:331
+#: contrib/admindocs/views.py:350
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (True, False o None)"
 
-#: contrib/admindocs/views.py:332
+#: contrib/admindocs/views.py:351
 msgid "Relation to parent model"
 msgstr "Collegamento a modello padre"
 
-#: contrib/admindocs/views.py:333
+#: contrib/admindocs/views.py:352
 msgid "Phone number"
 msgstr "Numero di telefono"
 
-#: contrib/admindocs/views.py:338
+#: contrib/admindocs/views.py:357
 msgid "Text"
 msgstr "Testo"
 
-#: contrib/admindocs/views.py:339
+#: contrib/admindocs/views.py:358
 msgid "Time"
 msgstr "Ora"
 
-#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
+#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
 #: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "URL"
 
-#: contrib/admindocs/views.py:341
+#: contrib/admindocs/views.py:360
 msgid "U.S. state (two uppercase letters)"
 msgstr "Stato USA (due lettere maiuscole)"
 
-#: contrib/admindocs/views.py:342
+#: contrib/admindocs/views.py:361
 msgid "XML text"
 msgstr "Testo XML"
 
-#: contrib/admindocs/views.py:368
+#: contrib/admindocs/views.py:387
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s non sembra essere un oggetto urlpattern"
@@ -1153,10 +1164,10 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 "\n"
-"<p class=\"help\">Per installare i bookmarklet, trascina il link sulla "
-"barra \n"
-"dei bookmark, o clicca il link con il tasto destro e aggiungilo ai "
-"bookmark.\n"
+"<p class=\"help\">Per installare i bookmarklet, trascina il link sulla barra "
+"\n"
+"dei bookmark, o clicca il link con il tasto destro e aggiungilo ai bookmark."
+"\n"
 "Potrai poi scegliere un bookmarklet in qualsiasi pagina del sito.\n"
 "Nota che alcuni di questi bookmarklet richiedono l'accesso al sito tramite "
 "un\n"
@@ -1253,7 +1264,7 @@ msgstr "Conferma password"
 
 #: contrib/auth/forms.py:30
 msgid "A user with that username already exists."
-msgstr "Un utente con questo nome·è già presente."
+msgstr "Un utente con questo nome è già presente."
 
 #: contrib/auth/forms.py:36 contrib/auth/forms.py:155
 #: contrib/auth/forms.py:197
@@ -1303,7 +1314,8 @@ msgstr "Password attuale"
 
 #: contrib/auth/forms.py:177
 msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "La password attuale non è stata inserita correttamente: va inserita di nuovo."
+msgstr ""
+"La password attuale non è stata inserita correttamente: va inserita di nuovo."
 
 #: contrib/auth/models.py:63 contrib/auth/models.py:86
 msgid "name"
@@ -1466,14 +1478,14 @@ msgstr "Commento"
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "Modera i termini: la parola %s non è ammessa."
-msgstr[1] "Modera i termini: le parole %s non sono ammesse."
+msgstr[0] "Modera i termini: la parola %s non è ammessa qui."
+msgstr[1] "Modera i termini: le parole %s non sono ammesse qui."
 
 #: contrib/comments/forms.py:180
 msgid "If you enter anything in this field your comment will be treated as spam"
 msgstr "Se inserisci qualcosa in questo campo il tuo commento verrà considerato spam"
 
-#: contrib/comments/models.py:22 contrib/contenttypes/models.py:71
+#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
 msgid "content type"
 msgstr "content type"
 
@@ -1701,11 +1713,11 @@ msgstr "Pubblica il tuo commento"
 msgid "or make changes"
 msgstr "o fai dei cambiamenti"
 
-#: contrib/contenttypes/models.py:67
+#: contrib/contenttypes/models.py:70
 msgid "python model class name"
 msgstr "nome della classe del modello Python"
 
-#: contrib/contenttypes/models.py:72
+#: contrib/contenttypes/models.py:75
 msgid "content types"
 msgstr "content type"
 
@@ -1777,18 +1789,26 @@ msgstr ""
 "Spiacenti, ma la tua form è scaduta. Puoi continuare a compilare la form da "
 "questa pagina."
 
-#: contrib/gis/forms/fields.py:14
+#: contrib/gis/forms/fields.py:17
 msgid "No geometry value provided."
 msgstr "Nessun valore geometrico fornito."
 
-#: contrib/gis/forms/fields.py:15
+#: contrib/gis/forms/fields.py:18
 msgid "Invalid geometry value."
 msgstr "Valore geometrico non valido."
 
-#: contrib/gis/forms/fields.py:16
+#: contrib/gis/forms/fields.py:19
 msgid "Invalid geometry type."
 msgstr "Tipo geometrico non valido."
 
+#: contrib/gis/forms/fields.py:20
+msgid ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
+msgstr ""
+"Si è verificato un errore durante la trasformazione della geometria nello "
+"SRID del campo geometria della form."
+
 #: contrib/humanize/templatetags/humanize.py:19
 msgid "th"
 msgstr "º"
@@ -2251,7 +2271,7 @@ msgstr "Schleswig-Holstein"
 
 #: contrib/localflavor/de/de_states.py:20
 msgid "Thuringia"
-msgstr "Thuringia"
+msgstr "Turingia"
 
 #: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
 #: contrib/localflavor/fr/forms.py:15
@@ -3017,7 +3037,9 @@ msgstr "Checksum errato per il Numero d'Imposta (NIP)."
 
 #: contrib/localflavor/pl/forms.py:109
 msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 9 o 14 cifre."
+msgstr ""
+"Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 9 o 14 "
+"cifre."
 
 #: contrib/localflavor/pl/forms.py:110
 msgid "Wrong checksum for the National Business Register Number (REGON)."
@@ -3625,27 +3647,27 @@ msgstr "Worcestershire"
 
 #: contrib/localflavor/uk/uk_regions.py:55
 msgid "County Antrim"
-msgstr "County Antrim"
+msgstr "Contea di Antrim"
 
 #: contrib/localflavor/uk/uk_regions.py:56
 msgid "County Armagh"
-msgstr "County Armagh"
+msgstr "Contea di Armagh"
 
 #: contrib/localflavor/uk/uk_regions.py:57
 msgid "County Down"
-msgstr "County Down"
+msgstr "Contea di Down"
 
 #: contrib/localflavor/uk/uk_regions.py:58
 msgid "County Fermanagh"
-msgstr "County Fermanagh"
+msgstr "Contea di Fermanagh"
 
 #: contrib/localflavor/uk/uk_regions.py:59
 msgid "County Londonderry"
-msgstr "County Londonderry"
+msgstr "Contea di Londonderry"
 
 #: contrib/localflavor/uk/uk_regions.py:60
 msgid "County Tyrone"
-msgstr "County Tyrone"
+msgstr "Contea di Tyrone"
 
 #: contrib/localflavor/uk/uk_regions.py:64
 msgid "Clwyd"
@@ -3750,7 +3772,7 @@ msgstr "Inserisci un codice postale nel formato XXXXX o XXXXX-XXXX ."
 #: contrib/localflavor/us/forms.py:54
 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
 msgstr ""
-"Inserisci un numero di assistenza sociale statunitense valido, nel formato "
+"Inserisci un numero di assistenza sociale USA valido, nel formato "
 "XXX-XX-XXXX ."
 
 #: contrib/localflavor/za/forms.py:20
@@ -3861,56 +3883,57 @@ msgstr "nome visualizzato"
 msgid "sites"
 msgstr "siti"
 
-#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700
+#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
 msgid "This value must be an integer."
 msgstr "Questo valore deve essere un intero."
 
-#: db/models/fields/__init__.py:387
+#: db/models/fields/__init__.py:388
 msgid "This value must be either True or False."
 msgstr "Questo valore deve essere True o False."
 
-#: db/models/fields/__init__.py:420
+#: db/models/fields/__init__.py:427
 msgid "This field cannot be null."
 msgstr "Questo campo non può essere nullo."
 
-#: db/models/fields/__init__.py:436
+#: db/models/fields/__init__.py:443
 msgid "Enter only digits separated by commas."
 msgstr "Inserisci solo cifre separate da virgole."
 
-#: db/models/fields/__init__.py:467
+#: db/models/fields/__init__.py:474
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Inserisci una data valida in formato AAAA-MM-GG."
 
-#: db/models/fields/__init__.py:476
+#: db/models/fields/__init__.py:483
 #, python-format
 msgid "Invalid date: %s"
 msgstr "Data non valida: %s"
 
-#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558
+#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
 msgstr "Inserisci una data/ora valida nel formato AAAA-MM-GG OO:MM[ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:594
+#: db/models/fields/__init__.py:601
 msgid "This value must be a decimal number."
 msgstr "Questo valore deve essere un numero decimale."
 
-#: db/models/fields/__init__.py:676
+#: db/models/fields/__init__.py:686
 msgid "This value must be a float."
 msgstr "Questo valore deve essere un numero a virgola mobile."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:746
 msgid "This value must be either None, True or False."
 msgstr "Questo valore deve essere None, True o False."
 
-#: db/models/fields/__init__.py:839 db/models/fields/__init__.py:853
+#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "Inserisci un'ora valida nel formato OO:MM[ss[.uuuuuu]]."
 
-#: db/models/fields/related.py:792
+#: db/models/fields/related.py:816
 msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
+msgstr ""
+"Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
 
-#: db/models/fields/related.py:870
+#: db/models/fields/related.py:894
 #, 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."
@@ -3972,11 +3995,11 @@ msgstr "Assicurarsi che non vi siano più di %s cifre decimali."
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Assicurarsi che non vi siano più di %s cifre prima della virgola."
 
-#: forms/fields.py:288 forms/fields.py:862
+#: forms/fields.py:288 forms/fields.py:863
 msgid "Enter a valid date."
 msgstr "Inserisci una data valida."
 
-#: forms/fields.py:322 forms/fields.py:863
+#: forms/fields.py:322 forms/fields.py:864
 msgid "Enter a valid time."
 msgstr "Inserisci un'ora valida."
 
@@ -3999,7 +4022,9 @@ msgstr "Il file inviato è vuoto."
 #: forms/fields.py:450
 #, python-format
 msgid "Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "Assicurarsi che questo nome di file non contenga più di %(max)d caratteri (ne ha %(length)d)."
+msgstr ""
+"Assicurarsi che questo nome di file non contenga più di %(max)d caratteri "
+"(ne ha %(length)d)."
 
 #: forms/fields.py:483
 msgid ""
@@ -4015,20 +4040,20 @@ msgstr "Inserisci una URL valida."
 msgid "This URL appears to be a broken link."
 msgstr "Questa URL non sembra funzionare."
 
-#: forms/fields.py:624 forms/fields.py:702
+#: forms/fields.py:625 forms/fields.py:703
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "Scegli un'opzione valida. '%(value)s non compare tra quelle disponibili."
 
-#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
+#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
 msgid "Enter a list of values."
 msgstr "Inserisci una lista di valori."
 
-#: forms/fields.py:891
+#: forms/fields.py:892
 msgid "Enter a valid IPv4 address."
 msgstr "Inserisci un indirizzo IPv4 valido."
 
-#: forms/fields.py:901
+#: forms/fields.py:902
 msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Inserisci uno 'slug' valido contenente lettere, cifre, sottolineati o "
@@ -4038,80 +4063,107 @@ msgstr ""
 msgid "Order"
 msgstr "Ordine"
 
-#: forms/models.py:299 forms/models.py:308
+#: forms/models.py:367
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr "%(field_name)s deve essere unico per %(lookup)s %(date_field)s."
+
+#: forms/models.py:381 forms/models.py:389
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s con questo %(field_label)s esiste già."
 
-#: forms/models.py:651
+#: forms/models.py:594, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Correggi i dati duplicati di %(field)s."
+
+#: forms/models.py:598
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr "Correggi i dati duplicati di %(field)s, che deve essere unico."
+
+#: forms/models.py:604
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"Correggi i dati duplicati di %(field_name)s che deve essere unico/a per %(lookup)s "
+"in %(date_field)s."
+
+#: forms/models.py:612
+msgid "Please correct the duplicate values below."
+msgstr "Correggi i dati duplicati qui sotto."
+
+#: forms/models.py:867
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "La foreign key inline non concorda con la chiave primaria dell'istanza "
-"principale."
+"padre."
 
-#: forms/models.py:706
+#: forms/models.py:930
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Scegli un'opzione valida. La scelta effettuata non compare tra quelle "
 "disponibili."
 
-#: forms/models.py:777
+#: forms/models.py:1004
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Scegli un'opzione valida. %s non compare tra quelle disponibili."
 
-#: forms/models.py:779
+#: forms/models.py:1006
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" non è un valore valido per una chiave primaria."
 
-#: template/defaultfilters.py:765
+#: template/defaultfilters.py:767
 msgid "yes,no,maybe"
 msgstr "sì,no,forse"
 
-#: template/defaultfilters.py:796
+#: template/defaultfilters.py:798
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d byte"
 
-#: template/defaultfilters.py:798
+#: template/defaultfilters.py:800
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:800
+#: template/defaultfilters.py:802
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:801
+#: template/defaultfilters.py:803
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: utils/dateformat.py:41
+#: utils/dateformat.py:42
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:42
+#: utils/dateformat.py:43
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:47
+#: utils/dateformat.py:48
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:48
+#: utils/dateformat.py:49
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:97
+#: utils/dateformat.py:98
 msgid "midnight"
 msgstr "mezzanotte"
 
-#: utils/dateformat.py:99
+#: utils/dateformat.py:100
 msgid "noon"
 msgstr "mezzogiorno"
 
@@ -4368,15 +4420,15 @@ msgstr "F j"
 #: views/generic/create_update.py:114
 #, python-format
 msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s creato correttamente."
+msgstr "%(verbose_name)s creato/a correttamente."
 
 #: views/generic/create_update.py:156
 #, python-format
 msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s aggiornato correttamente."
+msgstr "%(verbose_name)s aggiornato/a correttamente."
 
 #: views/generic/create_update.py:198
 #, python-format
 msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s è stato cancellato."
+msgstr "%(verbose_name)s cancellato/a."
 
diff --git a/django/conf/locale/it/LC_MESSAGES/djangojs.mo b/django/conf/locale/it/LC_MESSAGES/djangojs.mo
index 2208b3e6e3..310afc7efb 100644
Binary files a/django/conf/locale/it/LC_MESSAGES/djangojs.mo and b/django/conf/locale/it/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/it/LC_MESSAGES/djangojs.po b/django/conf/locale/it/LC_MESSAGES/djangojs.po
index 2e534b1494..ff7237968f 100644
--- a/django/conf/locale/it/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/it/LC_MESSAGES/djangojs.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-04-10 08:26+0200\n"
-"PO-Revision-Date: 2008-08-14 18:36+0200\n"
+"PO-Revision-Date: 2009-07-26 17:51+0200\n"
 "Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
-"Language-Team: Italian\n"
+"Language-Team: Italian <django-it@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
 
 #: contrib/admin/media/js/SelectFilter2.js:33
 #, perl-format
@@ -40,7 +40,7 @@ msgstr "%s scelti"
 
 #: contrib/admin/media/js/SelectFilter2.js:54
 msgid "Select your choice(s) and click "
-msgstr "Fai le tue scelte e clicca "
+msgstr "Seleziona le tue scelte e clicca "
 
 #: contrib/admin/media/js/SelectFilter2.js:59
 msgid "Clear all"
@@ -118,3 +118,4 @@ msgstr "Ieri"
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
 msgid "Tomorrow"
 msgstr "Domani"
+
diff --git a/django/conf/locale/mk/LC_MESSAGES/django.mo b/django/conf/locale/mk/LC_MESSAGES/django.mo
index b4ff149c2c..7796e56624 100644
Binary files a/django/conf/locale/mk/LC_MESSAGES/django.mo and b/django/conf/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/mk/LC_MESSAGES/django.po b/django/conf/locale/mk/LC_MESSAGES/django.po
index acbb0ab5b6..b1aa6fae1d 100644
--- a/django/conf/locale/mk/LC_MESSAGES/django.po
+++ b/django/conf/locale/mk/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-12 17:02+0200\n"
+"POT-Creation-Date: 2009-07-24 21:56+0200\n"
 "PO-Revision-Date: 2008-09-03 11:20+0200\n"
 "Last-Translator: Vasil Vangelovski <vvangelovski@gmail.com>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -222,14 +222,14 @@ msgstr "Традиционален кинески"
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Успешно беа избришани %(count)d %(items)s."
 
-#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
 msgid "Are you sure?"
 msgstr "Сигурни сте?"
 
 #: contrib/admin/actions.py:85
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
-msgstr "Избриши ги селектираните %(verbose_name_plural)s"
+msgstr "Избриши ги избраните %(verbose_name_plural)s"
 
 #: contrib/admin/filterspecs.py:44
 #, python-format
@@ -237,7 +237,7 @@ msgid ""
 "<h3>By %s:</h3>\n"
 "<ul>\n"
 msgstr ""
-"<h3>Од %s:</h3>\n"
+"<h3>Според %s:</h3>\n"
 "<ul>\n"
 
 #: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92
@@ -343,70 +343,71 @@ msgstr "Избришан  %(name)s „%(object)s“."
 msgid "No fields changed."
 msgstr "Не беше изменето ниедно поле."
 
-#: contrib/admin/options.py:598 contrib/auth/admin.py:67
+#: contrib/admin/options.py:599 contrib/auth/admin.py:67
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" беше успешно додаден."
+msgstr "Ставката %(name)s \"%(obj)s\" беше успешно додадена."
 
-#: contrib/admin/options.py:602 contrib/admin/options.py:635
+#: contrib/admin/options.py:603 contrib/admin/options.py:636
 #: contrib/auth/admin.py:75
 msgid "You may edit it again below."
 msgstr "Подолу можете повторно да го уредите."
 
-#: contrib/admin/options.py:612 contrib/admin/options.py:645
+#: contrib/admin/options.py:613 contrib/admin/options.py:646
 #, python-format
 msgid "You may add another %s below."
 msgstr "Подолу можете да додате уште еден %s."
 
-#: contrib/admin/options.py:633
+#: contrib/admin/options.py:634
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" беше успешно изменета."
 
-#: contrib/admin/options.py:641
+#: contrib/admin/options.py:642
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
-"%(name)s \"%(obj)s\" беше успешно додадена.Подолу можете повторно да ја "
-"уредите."
+"Ставката %(name)s \"%(obj)s\" беше успешно додадена. Подолу можете повторно "
+"да ја уредите."
 
-#: contrib/admin/options.py:772
+#: contrib/admin/options.py:773
 #, python-format
 msgid "Add %s"
 msgstr "Додади %s"
 
-#: contrib/admin/options.py:803 contrib/admin/options.py:1003
+#: contrib/admin/options.py:804 contrib/admin/options.py:1005
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
-msgstr ""
+msgstr "објект %(name)s со примарен клуч %(key)r не постои."
 
-#: contrib/admin/options.py:860
+#: contrib/admin/options.py:861
 #, python-format
 msgid "Change %s"
 msgstr "Измени %s"
 
-#: contrib/admin/options.py:904
+#: contrib/admin/options.py:905
 msgid "Database error"
-msgstr "Грешка во базата со податоци"
+msgstr "Грешка во базата на податоци"
 
-#: contrib/admin/options.py:940
+#: contrib/admin/options.py:941
+#, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s ставка %(name)s беше успешно изменета."
-msgstr[1] "%(count)s %(name)s беа успешно изменети."
+msgstr[1] "%(count)s ставки %(name)s беа успешно изменети."
 
-#: contrib/admin/options.py:1018
+#: contrib/admin/options.py:1020
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" беше избришана успешно."
+msgstr "Ставаката %(name)s \"%(obj)s\" беше избришана успешно."
 
-#: contrib/admin/options.py:1054
+#: contrib/admin/options.py:1057
 #, python-format
 msgid "Change history: %s"
 msgstr "Историја на измени: %s"
 
-#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
 #: contrib/auth/forms.py:80
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
@@ -415,11 +416,11 @@ msgstr ""
 "Ве молам внесете точно корисничко име и лозинка. Имајте на ум дека и во "
 "двете полиња се битни големите и малите букви."
 
-#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Ве молам најавете се повторно бидејќи вашата сесија е истечена."
 
-#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -427,27 +428,27 @@ msgstr ""
 "Изгледа дека вашиот прелистувач не е конфигуриран да прифаќа колачиња. Ве "
 "молам овозможете ги колачињата, превчитајте ја страта и пробајте повторно."
 
-#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
+#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Корисничките имиња неможе да го содржат „@“ знакот."
 
-#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Вашата е-пошта не е вашето корисничко име. Пробајте со „%s“."
 
-#: contrib/admin/sites.py:360
+#: contrib/admin/sites.py:367
 msgid "Site administration"
 msgstr "Администрација на сајт"
 
-#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "Најава"
 
-#: contrib/admin/sites.py:417
+#: contrib/admin/sites.py:426
 #, python-format
 msgid "%s administration"
 msgstr "%s администрација"
@@ -497,7 +498,7 @@ msgstr "Се извинуваме, но неможе да ја најдеме с
 
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:31
+#: contrib/admin/templates/admin/base.html:54
 #: contrib/admin/templates/admin/change_form.html:17
 #: contrib/admin/templates/admin/change_list.html:25
 #: contrib/admin/templates/admin/delete_confirmation.html:6
@@ -538,7 +539,7 @@ msgstr ""
 
 #: contrib/admin/templates/admin/actions.html:4
 msgid "Run the selected action"
-msgstr ""
+msgstr "Изврши ја избраната акција"
 
 #: contrib/admin/templates/admin/actions.html:4
 msgid "Go"
@@ -550,18 +551,18 @@ msgstr "Оди"
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:27
 msgid "Welcome,"
 msgstr "Добредојдовте,"
 
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:32
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Документација"
 
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:40
 #: contrib/admin/templates/admin/auth/user/change_password.html:14
 #: contrib/admin/templates/admin/auth/user/change_password.html:47
 #: contrib/admin/templates/registration/password_change_done.html:3
@@ -569,7 +570,7 @@ msgstr "Документација"
 msgid "Change password"
 msgstr "Промени лозинка"
 
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:47
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Log out"
@@ -648,7 +649,7 @@ msgstr "Да, сигурен сум"
 
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:9
 msgid "Delete multiple objects"
-msgstr "Избриши повеќе ставки."
+msgstr "Избриши повеќе ставки"
 
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:15
 msgid ""
@@ -656,17 +657,18 @@ msgid ""
 "your account doesn't have permission to delete the following types of "
 "objects:"
 msgstr ""
-"Бришење на %(object_name)s '%(escaped_object)s' ќе резултира со бришење на "
+"Бришење на %(object_name)s би резултирало со бришење на "
 "поврзаните објекти, но вие како корисник немате доволно привилегии да ги "
 "бришете следните типови на објекти:"
 
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:22
+#, python-format
 msgid ""
 "Are you sure you want to delete the selected %(object_name)s objects? All of "
 "the following objects and it's related items will be deleted:"
 msgstr ""
-"Сигурне сте дека сакате да ги избришете избраните %(object_name)s? "
-"Сите овие ставки и ставките поврзани со нив ќе бидат избришани:"
+"Сигурне сте дека сакате да ги избришете избраните %(object_name)s? Сите овие "
+"ставки и ставките поврзани со нив ќе бидат избришани:"
 
 #: contrib/admin/templates/admin/filter.html:2
 #, python-format
@@ -829,7 +831,7 @@ msgstr ""
 
 #: contrib/admin/templates/registration/logged_out.html:10
 msgid "Log in again"
-msgstr "Логирајте се повторно"
+msgstr "Најавете се повторно"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -983,7 +985,7 @@ msgstr "Сите датуми"
 #: contrib/admin/views/main.py:70
 #, python-format
 msgid "Select %s"
-msgstr "Изберет %s"
+msgstr "Изберете %s"
 
 #: contrib/admin/views/main.py:70
 #, python-format
@@ -998,145 +1000,145 @@ msgstr "сајт"
 msgid "template"
 msgstr "шаблон"
 
-#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
-#: contrib/admindocs/views.py:62
+#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
+#: contrib/admindocs/views.py:65
 msgid "tag:"
 msgstr "таг:"
 
-#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
-#: contrib/admindocs/views.py:95
+#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
+#: contrib/admindocs/views.py:98
 msgid "filter:"
 msgstr "филтер:"
 
-#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
-#: contrib/admindocs/views.py:159
+#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
+#: contrib/admindocs/views.py:162
 msgid "view:"
 msgstr "поглед:"
 
-#: contrib/admindocs/views.py:187
+#: contrib/admindocs/views.py:190
 #, python-format
 msgid "App %r not found"
 msgstr "Не е најдена апликацијата %r"
 
-#: contrib/admindocs/views.py:194
+#: contrib/admindocs/views.py:197
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Моделот %(model_name)r не е најден во апликацијата %(app_label)r"
 
-#: contrib/admindocs/views.py:206
+#: contrib/admindocs/views.py:209
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "поврзаниот `%(app_label)s.%(data_type)s` објект"
 
-#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:225
-#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244
-#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263
+#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
 msgid "model:"
 msgstr "модел:"
 
-#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253
+#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "поврзани `%(app_label)s.%(object_name)s` објекти"
 
-#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258
+#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
 #, python-format
 msgid "all %s"
 msgstr "сите %s"
 
-#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
 #, python-format
 msgid "number of %s"
 msgstr "број на %s"
 
-#: contrib/admindocs/views.py:268
+#: contrib/admindocs/views.py:271
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Полиња на %s објекти"
 
-#: contrib/admindocs/views.py:331 contrib/admindocs/views.py:342
-#: contrib/admindocs/views.py:344 contrib/admindocs/views.py:350
-#: contrib/admindocs/views.py:351 contrib/admindocs/views.py:353
+#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
+#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
+#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
 msgid "Integer"
 msgstr "Цел број"
 
-#: contrib/admindocs/views.py:332
+#: contrib/admindocs/views.py:335
 msgid "Boolean (Either True or False)"
 msgstr "Логичка (или точно или неточно)"
 
-#: contrib/admindocs/views.py:333 contrib/admindocs/views.py:352
+#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Збор (до %(max_length)s)"
 
-#: contrib/admindocs/views.py:334
+#: contrib/admindocs/views.py:337
 msgid "Comma-separated integers"
 msgstr "Целобројни вредности одделени со запирка"
 
-#: contrib/admindocs/views.py:335
+#: contrib/admindocs/views.py:338
 msgid "Date (without time)"
 msgstr "Датум (без час)"
 
-#: contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:339
 msgid "Date (with time)"
 msgstr "Датум (со час)"
 
-#: contrib/admindocs/views.py:337
+#: contrib/admindocs/views.py:340
 msgid "Decimal number"
 msgstr "Децимален број"
 
-#: contrib/admindocs/views.py:338
+#: contrib/admindocs/views.py:341
 msgid "E-mail address"
 msgstr "Адреса на е-пошта"
 
-#: contrib/admindocs/views.py:339 contrib/admindocs/views.py:340
-#: contrib/admindocs/views.py:343
+#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
+#: contrib/admindocs/views.py:346
 msgid "File path"
 msgstr "Патека на датотека"
 
-#: contrib/admindocs/views.py:341
+#: contrib/admindocs/views.py:344
 msgid "Floating point number"
 msgstr "Децимален број"
 
-#: contrib/admindocs/views.py:345 contrib/comments/models.py:60
+#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
 msgid "IP address"
 msgstr "ИП адреса"
 
-#: contrib/admindocs/views.py:347
+#: contrib/admindocs/views.py:350
 msgid "Boolean (Either True, False or None)"
 msgstr "Логичка (точно,неточно или празно)"
 
-#: contrib/admindocs/views.py:348
+#: contrib/admindocs/views.py:351
 msgid "Relation to parent model"
 msgstr "Релација со родителскиот модел"
 
-#: contrib/admindocs/views.py:349
+#: contrib/admindocs/views.py:352
 msgid "Phone number"
 msgstr "Телефонски број"
 
-#: contrib/admindocs/views.py:354
+#: contrib/admindocs/views.py:357
 msgid "Text"
 msgstr "Текст"
 
-#: contrib/admindocs/views.py:355
+#: contrib/admindocs/views.py:358
 msgid "Time"
 msgstr "Час"
 
-#: contrib/admindocs/views.py:356 contrib/comments/forms.py:95
+#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
 #: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "URL"
 
-#: contrib/admindocs/views.py:357
+#: contrib/admindocs/views.py:360
 msgid "U.S. state (two uppercase letters)"
 msgstr "Држава во САД (две големи букви)"
 
-#: contrib/admindocs/views.py:358
+#: contrib/admindocs/views.py:361
 msgid "XML text"
 msgstr "XML текст"
 
-#: contrib/admindocs/views.py:384
+#: contrib/admindocs/views.py:387
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s не изгледа дека е url објект"
@@ -1447,10 +1449,12 @@ msgid "Metadata"
 msgstr "Метаподатоци"
 
 #: contrib/comments/feeds.py:13
+#, python-format
 msgid "%(site_name)s comments"
 msgstr "коментари за %(site_name)s"
 
 #: contrib/comments/feeds.py:23
+#, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Последни коментари за %(site_name)s"
 
@@ -1576,14 +1580,12 @@ msgid "date"
 msgstr "датум"
 
 #: contrib/comments/models.py:181
-#, fuzzy
 msgid "comment flag"
-msgstr "коментар"
+msgstr "обележје за коментар"
 
 #: contrib/comments/models.py:182
-#, fuzzy
 msgid "comment flags"
-msgstr "коментар"
+msgstr "обележја за коментари"
 
 #: contrib/comments/templates/comments/approve.html:4
 msgid "Approve a comment"
@@ -1796,17 +1798,19 @@ msgstr "Не е внесена геометриска вредност."
 
 #: contrib/gis/forms/fields.py:18
 msgid "Invalid geometry value."
-msgstr "невалидна геометриска вредност."
+msgstr "Невалидна геометриска вредност."
 
 #: contrib/gis/forms/fields.py:19
 msgid "Invalid geometry type."
-msgstr "невалиден геометриски тип."
+msgstr "Невалиден геометриски тип."
 
 #: contrib/gis/forms/fields.py:20
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
+"Се појави грешка при трансформација на геометриската вредност во SRID од "
+"геометриското поле"
 
 #: contrib/humanize/templatetags/humanize.py:19
 msgid "th"
@@ -2135,84 +2139,75 @@ msgstr "Прага"
 
 #: contrib/localflavor/cz/cz_regions.py:9
 msgid "Central Bohemian Region"
-msgstr ""
+msgstr "Централен Бохемиски регион"
 
 #: contrib/localflavor/cz/cz_regions.py:10
 msgid "South Bohemian Region"
-msgstr ""
+msgstr "Јужен Бохемиски регион"
 
 #: contrib/localflavor/cz/cz_regions.py:11
-#, fuzzy
 msgid "Pilsen Region"
-msgstr "Зилина регион"
+msgstr "Пилзенски регион"
 
 #: contrib/localflavor/cz/cz_regions.py:12
 msgid "Carlsbad Region"
-msgstr ""
+msgstr "Карлсбадски регион"
 
 #: contrib/localflavor/cz/cz_regions.py:13
-#, fuzzy
 msgid "Usti Region"
-msgstr "Кошице регион"
+msgstr "Усти регион"
 
 #: contrib/localflavor/cz/cz_regions.py:14
-#, fuzzy
 msgid "Liberec Region"
-msgstr "Тренцин регион"
+msgstr "Либерец регион"
 
 #: contrib/localflavor/cz/cz_regions.py:15
-#, fuzzy
 msgid "Hradec Region"
-msgstr "Тренцин регион"
+msgstr "Храдец регион"
 
 #: contrib/localflavor/cz/cz_regions.py:16
-#, fuzzy
 msgid "Pardubice Region"
-msgstr "Кошице регион"
+msgstr "Пардубице регион"
 
 #: contrib/localflavor/cz/cz_regions.py:17
-#, fuzzy
 msgid "Vysocina Region"
-msgstr "Зилина регион"
+msgstr "Висоцина регион"
 
 #: contrib/localflavor/cz/cz_regions.py:18
 msgid "South Moravian Region"
-msgstr ""
+msgstr "Јужно Моравски регион"
 
 #: contrib/localflavor/cz/cz_regions.py:19
 msgid "Olomouc Region"
-msgstr ""
+msgstr "Оломуц регион"
 
 #: contrib/localflavor/cz/cz_regions.py:20
-#, fuzzy
 msgid "Zlin Region"
 msgstr "Зилина регион"
 
 #: contrib/localflavor/cz/cz_regions.py:21
 msgid "Moravian-Silesian Region"
-msgstr ""
+msgstr "Моравско-Силесански регион"
 
 #: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30
 msgid "Enter a postal code in the format XXXXX or XXX XX."
 msgstr "Внесете поштенски број во форматот XXXXX или XXX XX."
 
 #: contrib/localflavor/cz/forms.py:47
-#, fuzzy
 msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Внесете даночен број (NIP) во форматот XXX-XXX-XX-XX или XX-XX-XXX-XXX."
+msgstr "Внесете даночен број (NIP) во форматот XXXXXX/XXXX или XXXXXXXXXX."
 
 #: contrib/localflavor/cz/forms.py:48
 msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
 msgstr ""
+"Невалидна вредност за опционален параметар пол, валидни вредности се 'f' и "
+"'m'"
 
 #: contrib/localflavor/cz/forms.py:49
-#, fuzzy
 msgid "Enter a valid birth number."
 msgstr "Внесете правилен даночен број."
 
 #: contrib/localflavor/cz/forms.py:106
-#, fuzzy
 msgid "Enter a valid IC number."
 msgstr "Внесете правилен даночен број."
 
@@ -4029,10 +4024,12 @@ msgid "The submitted file is empty."
 msgstr "Пратената датотека е празна."
 
 #: forms/fields.py:450
+#, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
-"Осигурајте се дека ова име на датотека има најмногу %(max)d знаци (има %(length)d)."
+"Осигурајте се дека ова име на датотека има најмногу %(max)d знаци (има %"
+"(length)d)."
 
 #: forms/fields.py:483
 msgid ""
@@ -4077,7 +4074,7 @@ msgstr "Редослед"
 #: forms/models.py:367
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
+msgstr "%(field_name)s мора да биде уникатно за %(date_field)s %(lookup)s."
 
 #: forms/models.py:381 forms/models.py:389
 #, python-format
@@ -4085,13 +4082,16 @@ msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s со %(field_label)s веќе постои."
 
 #: forms/models.py:594
+#, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Ве молам поправете ја дуплираната вредност за  %(field)s."
 
 #: forms/models.py:598
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr "Ве молам поправете ја дуплираната вредност за %(field)s, која мора да биде уникатна."
+msgstr ""
+"Ве молам поправете ја дуплираната вредност за %(field)s, која мора да биде "
+"уникатна."
 
 #: forms/models.py:604
 #, python-format
@@ -4099,8 +4099,8 @@ msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
-"Ве молам поправете ја дуплираната вредност за %(field_name)s која мора да биде уникатна "
-"за %(lookup)s во %(date_field)s."
+"Ве молам поправете ја дуплираната вредност за %(field_name)s која мора да "
+"биде уникатна за %(lookup)s во %(date_field)s."
 
 #: forms/models.py:612
 msgid "Please correct the duplicate values below."
@@ -4109,6 +4109,8 @@ msgstr "Ве молам поправете ги дуплираните вред
 #: forms/models.py:867
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
+"Надворешниот клуч на вгезденото поле не се совпаѓа со примарниот клуч на "
+"родителската инстанца."
 
 #: forms/models.py:930
 msgid "Select a valid choice. That choice is not one of the available choices."
@@ -4122,7 +4124,7 @@ msgstr "Внесете правилно. %s не е еден од достапн
 #: forms/models.py:1006
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" не е правилна вредност за примарен клуч."
 
 #: template/defaultfilters.py:767
 msgid "yes,no,maybe"
@@ -4427,14 +4429,14 @@ msgstr "F j"
 #: views/generic/create_update.py:114
 #, python-format
 msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s беше успешно создаден."
+msgstr "Ставка %(verbose_name)s беше успешно создадена."
 
 #: views/generic/create_update.py:156
 #, python-format
 msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s беше успешно ажуриран."
+msgstr "Ставка %(verbose_name)s беше успешно ажурирана."
 
 #: views/generic/create_update.py:198
 #, python-format
 msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s беше избришан."
+msgstr "Ставка %(verbose_name)s беше избришана."
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index 55b8da6b98..8e523f3f96 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 c4fb1a5787..f27cb79d9e 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-16 10:12+0200\n"
-"PO-Revision-Date: 2009-04-12 15:27+0200\n"
+"PO-Revision-Date: 2009-07-24 15:44+0200\n"
 "Last-Translator: Christian Mikalsen and Jon Lønne\n"
 "Language-Team: Norsk <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -218,16 +218,16 @@ msgstr "Simplifisert kinesisk"
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
-#: contrib/admin/actions.py:56
+#: contrib/admin/actions.py:60
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Slettet %(count)d %(items)s."
 
-#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: contrib/admin/actions.py:81
+#: contrib/admin/actions.py:85
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Slett valgte %(verbose_name_plural)s"
@@ -266,15 +266,15 @@ msgstr "Denne måneden"
 msgid "This year"
 msgstr "I år"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
 msgid "Yes"
 msgstr "Ja"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
 msgid "No"
 msgstr "Nei"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -314,98 +314,99 @@ msgstr "logginnlegg"
 msgid "None"
 msgstr "Ingen"
 
-#: contrib/admin/options.py:517
+#: contrib/admin/options.py:519
 #, python-format
 msgid "Changed %s."
 msgstr "Endret %s."
 
-#: contrib/admin/options.py:517 contrib/admin/options.py:527
-#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
+#: contrib/admin/options.py:519 contrib/admin/options.py:529
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
+#: forms/models.py:600
 msgid "and"
 msgstr "og"
 
-#: contrib/admin/options.py:522
+#: contrib/admin/options.py:524
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Opprettet %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:526
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Endret %(list)s for %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:531
+#: contrib/admin/options.py:533
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Slettet %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:535
+#: contrib/admin/options.py:537
 msgid "No fields changed."
 msgstr "Ingen felt endret."
 
-#: contrib/admin/options.py:596 contrib/auth/admin.py:67
+#: contrib/admin/options.py:599 contrib/auth/admin.py:67
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" ble opprettet."
 
-#: contrib/admin/options.py:600 contrib/admin/options.py:633
+#: contrib/admin/options.py:603 contrib/admin/options.py:636
 #: contrib/auth/admin.py:75
 msgid "You may edit it again below."
 msgstr "Du kan redigere videre nedenfor."
 
-#: contrib/admin/options.py:610 contrib/admin/options.py:643
+#: contrib/admin/options.py:613 contrib/admin/options.py:646
 #, python-format
 msgid "You may add another %s below."
 msgstr "Du kan opprette ny %s nedenfor."
 
-#: contrib/admin/options.py:631
+#: contrib/admin/options.py:634
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" ble endret."
 
-#: contrib/admin/options.py:639
+#: contrib/admin/options.py:642
 #, 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 redigere videre nedenfor."
 
-#: contrib/admin/options.py:770
+#: contrib/admin/options.py:773
 #, python-format
 msgid "Add %s"
 msgstr "Opprett %s"
 
-#: contrib/admin/options.py:801 contrib/admin/options.py:1001
+#: contrib/admin/options.py:804 contrib/admin/options.py:1005
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s-objekt med primærnøkkelen %(key)r finnes ikke."
 
-#: contrib/admin/options.py:858
+#: contrib/admin/options.py:861
 #, python-format
 msgid "Change %s"
 msgstr "Rediger %s"
 
-#: contrib/admin/options.py:902
+#: contrib/admin/options.py:905
 msgid "Database error"
 msgstr "Databasefeil"
 
-#: contrib/admin/options.py:938
+#: contrib/admin/options.py:941
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s ble endret."
 msgstr[1] "%(count)s %(name)s ble endret."
 
-#: contrib/admin/options.py:1016
+#: contrib/admin/options.py:1020
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" ble slettet."
 
-#: contrib/admin/options.py:1052
+#: contrib/admin/options.py:1057
 #, python-format
 msgid "Change history: %s"
 msgstr "Endringshistorikk: %s"
 
-#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
 #: contrib/auth/forms.py:80
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
@@ -414,11 +415,11 @@ msgstr ""
 "Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på "
 "små og store bokstaver."
 
-#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Økten din har tidsavbrutt, vennligst logg inn igjen."
 
-#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -426,27 +427,27 @@ msgstr ""
 "Det ser ut som om nettleseren din ikke støtter informasjonskapsler "
 "(cookies). Vennligst konfigurer nettleseren din og prøv igjen."
 
-#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
+#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Brukernavnet kan ikke inneholde tegnet '@'."
 
-#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "E-postadressen er ikke brukernavnet ditt, prøv '%s' isteden."
 
-#: contrib/admin/sites.py:360
+#: contrib/admin/sites.py:367
 msgid "Site administration"
 msgstr "Nettstedsadministrasjon"
 
-#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "Logg inn"
 
-#: contrib/admin/sites.py:417
+#: contrib/admin/sites.py:426
 #, python-format
 msgid "%s administration"
 msgstr "%s-administrasjon"
@@ -496,7 +497,7 @@ msgstr "Beklager, men siden du spør etter finnes ikke."
 
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:33
+#: contrib/admin/templates/admin/base.html:54
 #: contrib/admin/templates/admin/change_form.html:17
 #: contrib/admin/templates/admin/change_list.html:25
 #: contrib/admin/templates/admin/delete_confirmation.html:6
@@ -540,7 +541,6 @@ msgid "Run the selected action"
 msgstr "Utfør den valgte handlingen"
 
 #: contrib/admin/templates/admin/actions.html:4
-#: contrib/admin/templates/admin/search_form.html:8
 msgid "Go"
 msgstr "Gå"
 
@@ -550,18 +550,18 @@ msgstr "Gå"
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:27
 msgid "Welcome,"
 msgstr "Velkommen,"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:32
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:40
 #: contrib/admin/templates/admin/auth/user/change_password.html:14
 #: contrib/admin/templates/admin/auth/user/change_password.html:47
 #: contrib/admin/templates/registration/password_change_done.html:3
@@ -569,7 +569,7 @@ msgstr "Dokumentasjon"
 msgid "Change password"
 msgstr "Endre passord"
 
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:47
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Log out"
@@ -699,6 +699,10 @@ msgstr "Mine handlinger"
 msgid "None available"
 msgstr "Ingen tilgjengelige"
 
+#: contrib/admin/templates/admin/index.html:72
+msgid "Unknown content"
+msgstr "Ukjent innhold"
+
 #: contrib/admin/templates/admin/invalid_setup.html:7
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
@@ -746,6 +750,15 @@ msgstr ""
 msgid "Show all"
 msgstr "Vis alle"
 
+#: contrib/admin/templates/admin/pagination.html:11
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Lagre"
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Search"
+msgstr "Søk"
+
 #: contrib/admin/templates/admin/search_form.html:10
 #, python-format
 msgid "1 result"
@@ -758,10 +771,6 @@ msgstr[1] "%(counter)s resultater"
 msgid "%(full_result_count)s total"
 msgstr "%(full_result_count)s totalt"
 
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Save"
-msgstr "Lagre"
-
 #: contrib/admin/templates/admin/submit_line.html:5
 msgid "Save as new"
 msgstr "Lagre som ny"
@@ -989,144 +998,145 @@ msgstr "nettside"
 msgid "template"
 msgstr "mal"
 
-#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
-#: contrib/admindocs/views.py:62
+#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
+#: contrib/admindocs/views.py:65
 msgid "tag:"
 msgstr "tag:"
 
-#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
-#: contrib/admindocs/views.py:95
+#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
+#: contrib/admindocs/views.py:98
 msgid "filter:"
 msgstr "filter:"
 
-#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
-#: contrib/admindocs/views.py:159
+#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
+#: contrib/admindocs/views.py:162
 msgid "view:"
 msgstr "view:"
 
-#: contrib/admindocs/views.py:187
+#: contrib/admindocs/views.py:190
 #, python-format
 msgid "App %r not found"
 msgstr "Fant ikke applikasjonen %r"
 
-#: contrib/admindocs/views.py:194
+#: contrib/admindocs/views.py:197
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Fant ikke modellen %(model_name)r i applikasjonen %(app_label)r"
 
-#: contrib/admindocs/views.py:206
+#: contrib/admindocs/views.py:209
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "det relaterte `%(app_label)s.%(data_type)s`-objektet"
 
-#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
-#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
 msgid "model:"
 msgstr "modell:"
 
-#: contrib/admindocs/views.py:237
+#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "relaterte `%(app_label)s.%(object_name)s`-objekter"
 
-#: contrib/admindocs/views.py:242
+#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
 #, python-format
 msgid "all %s"
 msgstr "alle %s"
 
-#: contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
 #, python-format
 msgid "number of %s"
 msgstr "antall %s"
 
-#: contrib/admindocs/views.py:252
+#: contrib/admindocs/views.py:271
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Felter på %s-objekter"
 
-#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
-#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
-#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
+#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
+#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
+#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
 msgid "Integer"
 msgstr "Heltall"
 
-#: contrib/admindocs/views.py:316
+#: contrib/admindocs/views.py:335
 msgid "Boolean (Either True or False)"
 msgstr "Boolsk (True eller False)"
 
-#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Tekst (opp til %(max_length)s tegn)"
 
-#: contrib/admindocs/views.py:318
+#: contrib/admindocs/views.py:337
 msgid "Comma-separated integers"
 msgstr "Heltall adskilt med komma"
 
-#: contrib/admindocs/views.py:319
+#: contrib/admindocs/views.py:338
 msgid "Date (without time)"
 msgstr "Dato (uten tid)"
 
-#: contrib/admindocs/views.py:320
+#: contrib/admindocs/views.py:339
 msgid "Date (with time)"
 msgstr "Dato (med tid)"
 
-#: contrib/admindocs/views.py:321
+#: contrib/admindocs/views.py:340
 msgid "Decimal number"
 msgstr "Desimaltall"
 
-#: contrib/admindocs/views.py:322
+#: contrib/admindocs/views.py:341
 msgid "E-mail address"
 msgstr "E-postadresse"
 
-#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
-#: contrib/admindocs/views.py:327
+#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
+#: contrib/admindocs/views.py:346
 msgid "File path"
 msgstr "Filsti"
 
-#: contrib/admindocs/views.py:325
+#: contrib/admindocs/views.py:344
 msgid "Floating point number"
 msgstr "Flyttall"
 
-#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
+#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: contrib/admindocs/views.py:331
+#: contrib/admindocs/views.py:350
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolsk (True, False eller None)"
 
-#: contrib/admindocs/views.py:332
+#: contrib/admindocs/views.py:351
 msgid "Relation to parent model"
 msgstr "Relasjon til foreldermodell"
 
-#: contrib/admindocs/views.py:333
+#: contrib/admindocs/views.py:352
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: contrib/admindocs/views.py:338
+#: contrib/admindocs/views.py:357
 msgid "Text"
 msgstr "Tekst"
 
-#: contrib/admindocs/views.py:339
+#: contrib/admindocs/views.py:358
 msgid "Time"
 msgstr "Tid"
 
-#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
+#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
 #: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "Nettadresse"
 
-#: contrib/admindocs/views.py:341
+#: contrib/admindocs/views.py:360
 msgid "U.S. state (two uppercase letters)"
 msgstr "Stat (i USA, to store bokstaver)"
 
-#: contrib/admindocs/views.py:342
+#: contrib/admindocs/views.py:361
 msgid "XML text"
 msgstr "XML-tekst"
 
-#: contrib/admindocs/views.py:368
+#: contrib/admindocs/views.py:387
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ser ikke ut til å være et urlpattern-objekt"
@@ -1770,18 +1780,25 @@ msgstr ""
 "Vi beklager, men dette skjemaet har tidsavbrutt. Vennligst fyll ut skjemaet "
 "fra denne siden."
 
-#: contrib/gis/forms/fields.py:14
+#: contrib/gis/forms/fields.py:17
 msgid "No geometry value provided."
 msgstr "Ingen geometriverdi oppgitt."
 
-#: contrib/gis/forms/fields.py:15
+#: contrib/gis/forms/fields.py:18
 msgid "Invalid geometry value."
 msgstr "Ugyldig geometriverdi"
 
-#: contrib/gis/forms/fields.py:16
+#: contrib/gis/forms/fields.py:19
 msgid "Invalid geometry type."
 msgstr "Ugyldig geometritype"
 
+#: contrib/gis/forms/fields.py:20
+msgid ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
+msgstr ""
+"En feil oppstod ved transformering av geometrien til SRID fra geometrifeltet."
+
 #: contrib/humanize/templatetags/humanize.py:19
 msgid "th"
 msgstr "."
@@ -3891,13 +3908,13 @@ msgstr "Verdien må være None, True eller False."
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "Oppgi tiden på formen TT:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/related.py:792
+#: db/models/fields/related.py:816
 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 mer enn en."
 
-#: db/models/fields/related.py:870
+#: db/models/fields/related.py:894
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -3956,11 +3973,11 @@ msgstr "Verdien kan ikke ha mer enn %s desimaler."
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Verdien kan ikke ha mer enn %s siffer foran komma."
 
-#: forms/fields.py:288 forms/fields.py:862
+#: forms/fields.py:288 forms/fields.py:863
 msgid "Enter a valid date."
 msgstr "Oppgi en gyldig dato."
 
-#: forms/fields.py:322 forms/fields.py:863
+#: forms/fields.py:322 forms/fields.py:864
 msgid "Enter a valid time."
 msgstr "Oppgi et gyldig tidspunkt."
 
@@ -4002,20 +4019,20 @@ msgstr "Oppgi en gyldig nettadresse."
 msgid "This URL appears to be a broken link."
 msgstr "Nettadressen fører til en side som ikke eksisterer."
 
-#: forms/fields.py:624 forms/fields.py:702
+#: forms/fields.py:625 forms/fields.py:703
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "Velg et gyldig valg. %(value)s er ikke et av de tilgjengelige valgene."
 
-#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
+#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
 msgid "Enter a list of values."
 msgstr "Oppgi en liste med verdier."
 
-#: forms/fields.py:891
+#: forms/fields.py:892
 msgid "Enter a valid IPv4 address."
 msgstr "Oppgi en gyldig IPv4-adresse."
 
-#: forms/fields.py:901
+#: forms/fields.py:902
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@@ -4026,25 +4043,53 @@ msgstr ""
 msgid "Order"
 msgstr "Rekkefølge"
 
-#: forms/models.py:299 forms/models.py:308
+#: forms/models.py:367
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr "%(field_name)s må være unik for %(date_field)s %(lookup)s."
+
+#: forms/models.py:381 forms/models.py:389
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s med %(field_label)s finnes allerede."
 
-#: forms/models.py:651
+#: forms/models.py:594
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Vennligst korriger duplisert data for %(field)s."
+
+#: forms/models.py:598
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr "Vennligst korriger duplisert data for %(field)s, som må være unik."
+
+#: forms/models.py:604
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"Vennligst korriger duplisert data for %(field_name)s, som må være unik for "
+"%(lookup)s i %(date_field)s."
+
+#: forms/models.py:612
+msgid "Please correct the duplicate values below."
+msgstr "Vennligst korriger de dupliserte verdiene nedenfor."
+
+#: forms/models.py:867
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Primærnøkkelen er ikke den samme som foreldreinstansens primærnøkkel."
 
-#: forms/models.py:706
+#: forms/models.py:930
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Velg et gyldig valg. Valget er ikke et av de tilgjengelige valgene."
 
-#: forms/models.py:777
+#: forms/models.py:1004
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Velg et gyldig valg. %s er ikke et av de tilgjengelige valgene."
 
-#: forms/models.py:779
+#: forms/models.py:1006
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" er ikke en gyldig verdi for en primærnøkkel."
@@ -4075,27 +4120,27 @@ msgstr "%.1f MB"
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: utils/dateformat.py:41
+#: utils/dateformat.py:42
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:42
+#: utils/dateformat.py:43
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:47
+#: utils/dateformat.py:48
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:48
+#: utils/dateformat.py:49
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:97
+#: utils/dateformat.py:98
 msgid "midnight"
 msgstr "midnatt"
 
-#: utils/dateformat.py:99
+#: utils/dateformat.py:100
 msgid "noon"
 msgstr "12:00"
 
diff --git a/django/conf/locale/th/LC_MESSAGES/django.mo b/django/conf/locale/th/LC_MESSAGES/django.mo
index 7dce1c3fea..026ba1b1f8 100644
Binary files a/django/conf/locale/th/LC_MESSAGES/django.mo and b/django/conf/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/th/LC_MESSAGES/django.po b/django/conf/locale/th/LC_MESSAGES/django.po
index 54283660c6..fbf67de078 100644
--- a/django/conf/locale/th/LC_MESSAGES/django.po
+++ b/django/conf/locale/th/LC_MESSAGES/django.po
@@ -2,214 +2,215 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Django\n"
+"Project-Id-Version: Django-1.1-rc-1\n"
 "Report-Msgid-Bugs-To: kowito@felspar.com\n"
 "POT-Creation-Date: 2008-09-02 22:36-0700\n"
-"PO-Revision-Date: 2008-11-26 18:40+0700\n"
+"PO-Revision-Date: 2009-07-28 22:31+0700\n"
 "Last-Translator: Kowit Charoenratchatabhan <kowito@felspar.com>\n"
-"Language-Team: Kowit Charoenratchatabhan,Kadsarin Sanjek, Felspar <kowito@felspar.com>\n"
+"Language-Team: Kowit Charoenratchatabhan<kowito@felspar.com>,Kadsarin Sanjek, Felspar,Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Thai\n"
-"X-Poedit-Country: Thailand\n"
+"X-Poedit-Country: THAILAND\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: conf/global_settings.py:44
 msgid "Arabic"
-msgstr "ภาษาอารบิก"
+msgstr "อารบิก"
 
 #: conf/global_settings.py:45
 msgid "Bengali"
-msgstr "ภาษาเบงกาลี"
+msgstr "เบ็งกาลี"
 
 #: conf/global_settings.py:46
 msgid "Bulgarian"
-msgstr "ภาษาบัลกาเรีย"
+msgstr "บัลแกเรีย"
 
 #: conf/global_settings.py:47
 msgid "Catalan"
-msgstr "ภาษาคาตาลาน"
+msgstr "คาตะลาน"
 
 #: conf/global_settings.py:48
 msgid "Czech"
-msgstr "ภาษาเชค"
+msgstr "เช็ก"
 
 #: conf/global_settings.py:49
 msgid "Welsh"
-msgstr "ภาษาเวลส์"
+msgstr "เวลส์"
 
 #: conf/global_settings.py:50
 msgid "Danish"
-msgstr "ภาษาเดนมาร์ก"
+msgstr "เดนมาร์ก"
 
 #: conf/global_settings.py:51
 msgid "German"
-msgstr "ภาษาเยอรมัน"
+msgstr "เยอรมัน"
 
 #: conf/global_settings.py:52
 msgid "Greek"
-msgstr "ภาษากรีก"
+msgstr "กรีก"
 
 #: conf/global_settings.py:53
 msgid "English"
-msgstr "ภาษาอังกฤษ"
+msgstr "อังกฤษ"
 
 #: conf/global_settings.py:54
 msgid "Spanish"
-msgstr "ภาษาสเปน"
+msgstr "สเปน"
 
 #: conf/global_settings.py:55
 msgid "Estonian"
-msgstr "ภาษาเอสโตเนีย"
+msgstr "เอสโตเนีย"
 
 #: conf/global_settings.py:56
 msgid "Argentinean Spanish"
-msgstr "ภาษาสเปน(อาร์เจนตินา)"
+msgstr "สเปน (อาร์เจนตินา)"
 
 #: conf/global_settings.py:57
 msgid "Basque"
-msgstr "ภาษาบาสค์"
+msgstr "แบ็ซค์"
 
 #: conf/global_settings.py:58
 msgid "Persian"
-msgstr "ภาษาเปอร์เชีย"
+msgstr "เปอร์เชีย"
 
 #: conf/global_settings.py:59
 msgid "Finnish"
-msgstr "ภาษาฟินแลนด์"
+msgstr "ฟินแลนด์"
 
 #: conf/global_settings.py:60
 msgid "French"
-msgstr "ภาษาฝรั่งเศส"
+msgstr "ฝรั่งเศส"
 
 #: conf/global_settings.py:61
 msgid "Irish"
-msgstr "ภาษาไอร์แลนด์"
+msgstr "ไอริช"
 
 #: conf/global_settings.py:62
 msgid "Galician"
-msgstr "ภาษากาลิเซีย"
+msgstr "กาลิเซีย"
 
 #: conf/global_settings.py:63
 msgid "Hungarian"
-msgstr "ภาษาฮังการี"
+msgstr "ฮังการี"
 
 #: conf/global_settings.py:64
 msgid "Hebrew"
-msgstr "ภาษาฮิบรู"
+msgstr "ฮีบรู"
 
 #: conf/global_settings.py:65
 msgid "Croatian"
-msgstr "ภาษาโครเอเชีย"
+msgstr "โครเอเชีย"
 
 #: conf/global_settings.py:66
 msgid "Icelandic"
-msgstr "ภาษาไอซ์แลนด์"
+msgstr "ไอซ์แลนด์"
 
 #: conf/global_settings.py:67
 msgid "Italian"
-msgstr "ภาษาอิตาลี"
+msgstr "อิตาลี"
 
 #: conf/global_settings.py:68
 msgid "Japanese"
-msgstr "ภาษาญี่ปุ่น"
+msgstr "ญี่ปุ่น"
 
 #: conf/global_settings.py:69
 msgid "Georgian"
-msgstr "ภาษาจอร์เจีย"
+msgstr "จอร์เจีย"
 
 #: conf/global_settings.py:70
 msgid "Korean"
-msgstr "ภาษาเกาหลี"
+msgstr "เกาหลี"
 
 #: conf/global_settings.py:71
 msgid "Khmer"
-msgstr "ภาษาเขมร"
+msgstr "เขมร"
 
 #: conf/global_settings.py:72
 msgid "Kannada"
-msgstr "ภาษาคานนาดา"
+msgstr "กัณณาท"
 
 #: conf/global_settings.py:73
 msgid "Latvian"
-msgstr "ภาษาลัตเวีย"
+msgstr "ลัตเวีย"
 
 #: conf/global_settings.py:74
 msgid "Lithuanian"
-msgstr "ภาษาลิทัวเนีย"
+msgstr "ลิทัวเนีย"
 
 #: conf/global_settings.py:75
 msgid "Macedonian"
-msgstr "ภาษามาซีโดเนีย"
+msgstr "มาซิโดเนีย"
 
 #: conf/global_settings.py:76
 msgid "Dutch"
-msgstr "ภาษาดัตช์"
+msgstr "ดัตช์"
 
 #: conf/global_settings.py:77
 msgid "Norwegian"
-msgstr "ภาษานอร์เวย์"
+msgstr "นอร์เวย์"
 
 #: conf/global_settings.py:78
 msgid "Polish"
-msgstr "ภาษาโปแลนด์"
+msgstr "โปแลนด์"
 
 #: conf/global_settings.py:79
 msgid "Portugese"
-msgstr "ภาษาโปรตุเกส"
+msgstr "โปรตุเกส"
 
 #: conf/global_settings.py:80
 msgid "Brazilian Portuguese"
-msgstr "ภาษาโปรตุเกส (บราซิล)"
+msgstr "โปรตุเกส (บราซิล)"
 
 #: conf/global_settings.py:81
 msgid "Romanian"
-msgstr "ภาษาโรมาเนีย"
+msgstr "โรมาเนีย"
 
 #: conf/global_settings.py:82
 msgid "Russian"
-msgstr "ภาษารัสเซีย"
+msgstr "รัสเซีย"
 
 #: conf/global_settings.py:83
 msgid "Slovak"
-msgstr "ภาษาสโลวัค"
+msgstr "สโลวัก"
 
 #: conf/global_settings.py:84
 msgid "Slovenian"
-msgstr "ภาษาสโลเวเนีย"
+msgstr "สโลวีเนีย"
 
 #: conf/global_settings.py:85
 msgid "Serbian"
-msgstr "ภาษาเซอร์เบีย"
+msgstr "เซอร์เบีย"
 
 #: conf/global_settings.py:86
 msgid "Swedish"
-msgstr "ภาษาสวีเดน"
+msgstr "สวีเดน"
 
 #: conf/global_settings.py:87
 msgid "Tamil"
-msgstr "ภาษาทมิฬ"
+msgstr "ทมิฬ"
 
 #: conf/global_settings.py:88
 msgid "Telugu"
-msgstr "ภาษาเตลูกู"
+msgstr "เตลุคู"
 
 #: conf/global_settings.py:89
 msgid "Turkish"
-msgstr "ภาษาตุรกี"
+msgstr "ตุรกี"
 
 #: conf/global_settings.py:90
 msgid "Ukrainian"
-msgstr "ภาษายูเครน"
+msgstr "ยูเครน"
 
 #: conf/global_settings.py:91
 msgid "Simplified Chinese"
-msgstr "อักษรจีนดั้งเดิม"
+msgstr "จีนตัวย่อ"
 
 #: conf/global_settings.py:92
 msgid "Traditional Chinese"
-msgstr "อักษรจีนสมัยใหม่"
+msgstr "จีนตัวเต็ม"
 
 #: contrib/admin/filterspecs.py:44
 #, python-format
@@ -268,7 +269,7 @@ msgstr "เวลาลงมือ"
 
 #: contrib/admin/models.py:22
 msgid "object id"
-msgstr "object id"
+msgstr "อ็อบเจ็กต์ไอดี"
 
 #: contrib/admin/models.py:23
 msgid "object repr"
@@ -309,12 +310,12 @@ msgstr "และ"
 #: contrib/admin/options.py:343
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
-msgstr "เพิ่ม %(name)s \"%(object)s\"."
+msgstr "เพิ่ม %(name)s \"%(object)s\" แล้ว"
 
 #: contrib/admin/options.py:347
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
-msgstr "เปลี่ยน %(list)s เพื่อ %(name)s \"%(object)s\""
+msgstr "เปลี่ยน %(list)s สำหรับ %(name)s \"%(object)s\" แล้ว"
 
 #: contrib/admin/options.py:352
 #, python-format
@@ -329,39 +330,39 @@ msgstr "ไม่มีฟิลด์ใดถูกเปลี่ยน"
 #: contrib/auth/admin.py:51
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" ได้ถูกเพิ่มเรียบร้อยแล้ว"
+msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว"
 
 #: contrib/admin/options.py:421
 #: contrib/admin/options.py:454
 #: contrib/auth/admin.py:59
 msgid "You may edit it again below."
-msgstr "สามารถแก้ไขเพิ่มเติมได้ด้านล่าง"
+msgstr "สามารถแก้ไขเพิ่มเติมได้ที่ด้านล่าง"
 
 #: contrib/admin/options.py:431
 #: contrib/admin/options.py:464
 #, python-format
 msgid "You may add another %s below."
-msgstr "คุณอาจจะเพิ่ม %s ได้อีกด้านล่าง"
+msgstr "คุณสามารถเพิ่ม %s ได้อีกที่ด้านล่าง"
 
 #: contrib/admin/options.py:452
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ได้ถูกเปลี่ยนแปลงเรียบร้อยแล้ว"
+msgstr "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว"
 
 #: contrib/admin/options.py:460
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr " %(name)s \"%(obj)s\" ได้ถูกเพิ่มเรียบร้อยแล้ว, แก้ไขได้ด้านล่าง"
+msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว แก้ไขได้อีกที่ด้านล่าง"
 
 #: contrib/admin/options.py:536
 #, python-format
 msgid "Add %s"
-msgstr "เพิ่ม%s"
+msgstr "เพิ่ม %s"
 
 #: contrib/admin/options.py:614
 #, python-format
 msgid "Change %s"
-msgstr "เปลี่ยนแปลง %s"
+msgstr "เปลี่ยน %s"
 
 #: contrib/admin/options.py:646
 msgid "Database error"
@@ -370,7 +371,7 @@ msgstr "เกิดความผิดพลาดที่ฐานข้อ
 #: contrib/admin/options.py:696
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" ได้ถูกลบเรียบร้อยแล้ว"
+msgstr "ลบ %(name)s \"%(obj)s\" เรียบร้อยแล้ว"
 
 #: contrib/admin/options.py:703
 msgid "Are you sure?"
@@ -395,19 +396,19 @@ msgstr "กรุณาลงชื่อเข้าใช้อีกครั
 #: contrib/admin/sites.py:234
 #: contrib/admin/views/decorators.py:47
 msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "ดูเหมือนบราวเซอร์ของคุณจะไม่เปิดระบบคุกกี้ กรุณาเปิดระบบคุกกี้และลองเรียกหน้านี้ใหม่อีกครั้ง"
+msgstr "ดูเหมือนเบราว์เซอร์ของคุณจะไม่เปิดรับคุกกี้ กรุณาเปิดรับคุกกี้และลองเรียกหน้านี้ใหม่อีกครั้ง"
 
 #: contrib/admin/sites.py:250
 #: contrib/admin/sites.py:256
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
-msgstr "ชื่อผู้ใช้ไม่สามารถใช้ '@' สัญลักษณ์นี้ได้"
+msgstr "ชื่อผู้ใช้ไม่สามารถใช้อักขระ '@' ได้"
 
 #: contrib/admin/sites.py:253
 #: contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "อีเมลล์นี้ไม่สามารถใช้ชื่อผู้ใช้นี้ได้ ลองใช้ '%s' "
+msgstr "ที่อยู่อีเมลไม่ใช่ชื่อผู้ใช้ของคุณ ลองใช้ '%s' แทน"
 
 #: contrib/admin/sites.py:313
 msgid "Site administration"
@@ -445,7 +446,7 @@ msgstr "เวลา :"
 
 #: contrib/admin/widgets.py:94
 msgid "Currently:"
-msgstr "ปัจจุบัน :"
+msgstr "ปัจจุบัน:"
 
 #: contrib/admin/widgets.py:94
 msgid "Change:"
@@ -502,7 +503,7 @@ 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 "เกิดเหตุขัดข้องขี้น ทางเราได้รายงานไปยังหน่วยงานที่ดูแลแล้ว และจะดำเนินการซ่อมแซมอย่างเร่งด่วน ขอบคุณ"
+msgstr "เกิดเหตุขัดข้องขี้น ทางเราได้รายงานไปยังผู้ดูแลระบบแล้ว และจะดำเนินการแก้ไขอย่างเร่งด่วน ขอบคุณที่ราบงานความผิดพลาด"
 
 #: contrib/admin/templates/admin/app_index.html:10
 #: contrib/admin/templates/admin/index.html:19
@@ -562,7 +563,8 @@ msgstr "ดูที่หน้าเว็บ"
 #: contrib/admin/templates/admin/change_form.html:38
 #: contrib/admin/templates/admin/auth/user/change_password.html:22
 msgid "Please correct the error below."
-msgstr "โปรดแก้ไขข้อผิดพลาดด้านล่าง"
+msgid_plural "Please correct the errors below."
+msgstr[0] "โปรดแก้ไขข้อผิดพลาดด้านล่าง"
 
 #: contrib/admin/templates/admin/change_list.html:16
 #, python-format
@@ -582,7 +584,7 @@ msgstr "ลบ"
 #: contrib/admin/templates/admin/delete_confirmation.html:16
 #, python-format
 msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "กำลังดำเนินการลบ %(object_name)s '%(escaped_object)s'และจะแสดงผลการลบ ชื่อผู้ใช้งานของคุณไม่สามารถทำการลบข้อมูลนี้ได้"
+msgstr "กำลังดำเนินการลบ %(object_name)s '%(escaped_object)s'และจะแสดงผลการลบ แต่บัญชีของคุณไม่สามารถทำการลบข้อมูลชนิดนี้ได้"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:23
 #, python-format
@@ -601,7 +603,7 @@ msgstr " โดย %(filter_title)s "
 #: contrib/admin/templates/admin/index.html:18
 #, python-format
 msgid "Models available in the %(name)s application."
-msgstr "Models available in the %(name)s application."
+msgstr "โมเดลใช้ได้ในแอป %(name)s ."
 
 #: contrib/admin/templates/admin/index.html:35
 msgid "Change"
@@ -625,15 +627,15 @@ msgstr "ไม่ว่าง"
 
 #: contrib/admin/templates/admin/invalid_setup.html:7
 msgid "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user."
-msgstr "มีสิ่งผิดปกติเกิดขึ้นกับการติดตั้งฐานข้อมูล กรุณาตรวจสอบอีกครั้ง ฐานข้อมูลได้ถูกติดตั้งแล้ว กรุณาตอบสอบให้แน่ใจว่าสามารถใช้งานได้โดยผู้ใช้ที่จัดสรรให้"
+msgstr "มีสิ่งผิดปกติเกิดขึ้นกับการติดตั้งฐานข้อมูล กรุณาตรวจสอบอีกครั้งว่าฐานข้อมูลได้ถูกติดตั้งแล้ว หรือฐานข้อมูลสามารถอ่านและเขียนได้โคยผู้ใช้นี้"
 
 #: contrib/admin/templates/admin/login.html:19
 msgid "Username:"
-msgstr "ชื่อผู้ใช้"
+msgstr "ชื่อผู้ใช้:"
 
 #: contrib/admin/templates/admin/login.html:22
 msgid "Password:"
-msgstr "รหัสผ่าน"
+msgstr "รหัสผ่าน:"
 
 #: contrib/admin/templates/admin/object_history.html:22
 msgid "Date/time"
@@ -654,11 +656,11 @@ msgstr "N j, Y, P"
 
 #: contrib/admin/templates/admin/object_history.html:38
 msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "อ็อบเจ็กนี้ไม่ได้แก้ไขประวัติ เป็นไปได้ว่าอาจจะไม่ได้ถูกเพิ่มเข้าไปในส่วนของผู้ดูแลระบบ"
+msgstr "อ็อบเจ็กต์นี้ไม่ได้แก้ไขประวัติ เป็นไปได้ว่ามันอาจจะไม่ได้ถูกเพิ่มเข้าไปโดยระบบ"
 
 #: contrib/admin/templates/admin/pagination.html:10
 msgid "Show all"
-msgstr "แสดงผลทั้งหมด"
+msgstr "แสดงทั้งหมด"
 
 #: contrib/admin/templates/admin/search_form.html:8
 msgid "Go"
@@ -667,7 +669,8 @@ msgstr "ไป"
 #: contrib/admin/templates/admin/search_form.html:10
 #, python-format
 msgid "1 result"
-msgstr "1 ผลลัพท์"
+msgid_plural "%(counter)s results"
+msgstr[0] "%(counter)s ผลลัพท์"
 
 #: contrib/admin/templates/admin/search_form.html:10
 #, python-format
@@ -688,7 +691,7 @@ msgstr "บันทึกและเพิ่ม"
 
 #: contrib/admin/templates/admin/submit_line.html:7
 msgid "Save and continue editing"
-msgstr "บันทึกและเริ่มต้นการแก้ไข"
+msgstr "บันทึกและกลับมาแก้ไข"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:6
 msgid "First, enter a username and password. Then, you'll be able to edit more user options."
@@ -718,7 +721,7 @@ msgstr "รหัสผ่าน (อีกครั้ง)"
 #: contrib/admin/templates/admin/auth/user/add_form.html:27
 #: contrib/admin/templates/admin/auth/user/change_password.html:40
 msgid "Enter the same password as above, for verification."
-msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบ"
+msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบความถูกต้อง"
 
 #: contrib/admin/templates/admin/auth/user/change_password.html:26
 #, python-format
@@ -755,7 +758,7 @@ msgstr "รหัสผ่านของคุณถูกเปลี่ยน
 
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "กรุณาใส่รหัสผ่านเดิม ด้วยเหตุผลทางด้านการรักษาความปลอดภัย หลังจากนั้นให้ใส่รหัสผ่านตัวใหม่อีกสองครั้ง เพื่อตรวจสอบว่าคุณได้พิมพ์รหัสอย่างถูกต้อง"
+msgstr "กรุณาใส่รหัสผ่านเดิม ด้วยเหตุผลทางด้านการรักษาความปลอดภัย หลังจากนั้นให้ใส่รหัสผ่านใหม่อีกสองครั้ง เพื่อตรวจสอบว่าคุณได้พิมพ์รหัสอย่างถูกต้อง"
 
 #: contrib/admin/templates/registration/password_change_form.html:17
 msgid "Old password:"
@@ -821,7 +824,7 @@ msgstr "การตั้งค่ารหัสผ่านใหม่เร
 
 #: contrib/admin/templates/registration/password_reset_done.html:12
 msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "เราได้ส่งอีเมลการตั้งรหัสผ่านถึงคุณ ไปที่อีเมลที่คุณให้ไว้เรียบร้อยแล้ว และคุณจะได้รับเร็วๆ นี้"
+msgstr "เราได้ส่งอีเมลวิธีการตั้งรหัสผ่าน ไปที่อีเมลที่คุณให้ไว้เรียบร้อยแล้ว และคุณจะได้รับเร็วๆ นี้"
 
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
@@ -838,7 +841,7 @@ msgstr "กรุณาไปที่หน้านี้และเลือ
 
 #: contrib/admin/templates/registration/password_reset_email.html:9
 msgid "Your username, in case you've forgotten:"
-msgstr "ชื่อผู้ใช้งานของคุณ ในกรณีที่คุณลืม:"
+msgstr "ชื่อผู้ใช้ของคุณ ในกรณีที่คุณถูกลืม:"
 
 #: contrib/admin/templates/registration/password_reset_email.html:11
 msgid "Thanks for using our site!"
@@ -851,7 +854,7 @@ msgstr "%(site_name)s ทีม"
 
 #: contrib/admin/templates/registration/password_reset_form.html:12
 msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one."
-msgstr "ลืมรหัสผ่าน? กรุณาใส่อีเมลด้านล่าง ทางเราจะทำการส่งวิธีการในการสร้างรหัสผ่านใหม่ไปให้"
+msgstr "ลืมรหัสผ่าน? กรุณาใส่อีเมลด้านล่าง ทางเราจะทำการส่งวิธีการในการตั้งรหัสผ่านใหม่ไปให้"
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -873,7 +876,7 @@ msgstr "เลือก %s"
 #: contrib/admin/views/main.py:69
 #, python-format
 msgid "Select %s to change"
-msgstr "เลือก %s เพื่อเปลี่ยน"
+msgstr "เลือก %s เพื่อเปลี่ยนแปลง"
 
 #: contrib/admin/views/template.py:36
 #: contrib/sites/models.py:38
@@ -888,7 +891,7 @@ msgstr "เทมเพลต"
 #: contrib/admindocs/views.py:59
 #: contrib/admindocs/views.py:61
 msgid "tag:"
-msgstr "ป้าย:"
+msgstr "ป้ายกำกับ:"
 
 #: contrib/admindocs/views.py:90
 #: contrib/admindocs/views.py:92
@@ -905,17 +908,17 @@ msgstr "ดู:"
 #: contrib/admindocs/views.py:186
 #, python-format
 msgid "App %r not found"
-msgstr "ไม่พบโปรแกรม %r "
+msgstr "ไม่พบแอป %r "
 
 #: contrib/admindocs/views.py:193
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
-msgstr "ไม่พบโมเดล %(model_name)r ในโปรแกรม %(app_label)r"
+msgstr "ไม่พบโมเดล %(model_name)r ในแอป %(app_label)r"
 
 #: contrib/admindocs/views.py:205
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
-msgstr "ความสัมพันธ์`%(app_label)s.%(data_type)s` อ็อบเจ็ก"
+msgstr "ความสัมพันธ์`%(app_label)s.%(data_type)s` อ็อบเจ็กต์"
 
 #: contrib/admindocs/views.py:205
 #: contrib/admindocs/views.py:227
@@ -927,7 +930,7 @@ msgstr "โมเดล:"
 #: contrib/admindocs/views.py:236
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
-msgstr "ความสัมพันธ์`%(app_label)s.%(object_name)s` อ็อบเจ็ก"
+msgstr "ความสัมพันธ์`%(app_label)s.%(object_name)s` อ็อบเจ็กต์"
 
 #: contrib/admindocs/views.py:241
 #, python-format
@@ -942,7 +945,7 @@ msgstr "จำนวนของ %s"
 #: contrib/admindocs/views.py:251
 #, python-format
 msgid "Fields on %s objects"
-msgstr "ฟิลด์บน %s อ็อบเจ็ก"
+msgstr "ฟิลด์บน %s อ็อบเจ็กต์"
 
 #: contrib/admindocs/views.py:314
 #: contrib/admindocs/views.py:325
@@ -965,7 +968,7 @@ msgstr "สตริง(ได้ถึง %(max_length)s)"
 
 #: contrib/admindocs/views.py:317
 msgid "Comma-separated integers"
-msgstr "จำนวนเต็มที่มีจุลภาคคั่น"
+msgstr "จำนวนเต็มแบบมีจุลภาค"
 
 #: contrib/admindocs/views.py:318
 msgid "Date (without time)"
@@ -977,7 +980,7 @@ msgstr "วันที่ (พร้อมด้วยเวลา)"
 
 #: contrib/admindocs/views.py:320
 msgid "Decimal number"
-msgstr "เลขฐานสิบ"
+msgstr "เลขฐานสิบหรือเลขทศนิยม"
 
 #: contrib/admindocs/views.py:321
 msgid "E-mail address"
@@ -987,16 +990,16 @@ msgstr "ที่อยู่อีเมล"
 #: contrib/admindocs/views.py:323
 #: contrib/admindocs/views.py:326
 msgid "File path"
-msgstr "ไฟล์พาธ"
+msgstr "ตำแหน่งไฟล์"
 
 #: contrib/admindocs/views.py:324
 msgid "Floating point number"
-msgstr "เลชทศนิยม"
+msgstr "เลขทศนิยม"
 
 #: contrib/admindocs/views.py:328
 #: contrib/comments/models.py:58
 msgid "IP address"
-msgstr "ไอพี แอดเดรส"
+msgstr "หมายเลขไอพี"
 
 #: contrib/admindocs/views.py:330
 msgid "Boolean (Either True, False or None)"
@@ -1027,7 +1030,7 @@ msgstr "URL"
 
 #: contrib/admindocs/views.py:340
 msgid "U.S. state (two uppercase letters)"
-msgstr "รัฐในสหรัฐ(ตัวอักษรใหญ่ 2 ตัว)"
+msgstr "รัฐในสหรัฐ (ตัวอักษรใหญ่ 2 ตัว)"
 
 #: contrib/admindocs/views.py:341
 msgid "XML text"
@@ -1036,7 +1039,7 @@ msgstr "ข้อความ XML"
 #: contrib/admindocs/views.py:367
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
-msgstr "%s ดูเหมือนจะไม่ใช่ urlpattern อ็อบเจ็ก"
+msgstr "%s ดูเหมือนจะไม่ใช่ urlpattern อ็อบเจ็กต์"
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Bookmarklets"
@@ -1057,9 +1060,9 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 "\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"
+"<p class=\"help\">เพื่อติดตั้ง bookmarklets, ลากลิ้งก์ไปที่แถบเครื่องมือบุ๊กมาร์ค\n"
+", หรือคลิกขวาที่ลิ้งและเพิ่มเข้าบุ๊กมาร์คของคุณ. ตอนนี้คุณสามารถ\n"
+"เลือก bookmarklet จากหน้าใดๆในเว็บไซต์.  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"
@@ -1074,19 +1077,19 @@ msgstr "ย้ายจากทุกหน้าไปที่วิวที
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:21
 msgid "Show object ID"
-msgstr "แสดงอ็อบเจ็กไอดี"
+msgstr "แสดงอ็อบเจ็กต์ไอดี"
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:22
 msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "แสดง content-type และ unique ID เพื่อแสดงอ็อบเจ็กเดี่ยว."
+msgstr "แสดง content-type และ unique ID เพื่อแสดงอ็อบเจ็กต์เพียงอย่างเดียว."
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:24
 msgid "Edit this object (current window)"
-msgstr "แก้ไขออปเจ็กนี้ (หน้าต่างปัจจุบัน)"
+msgstr "แก้ไขออปเจ็กนี้ (ในหน้าต่างปัจจุบัน)"
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:25
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "ไปที่หน้าแอดมินเพื่อแสดงอ็อบเจ็กเดี่ยว."
+msgstr "ไปที่หน้าแอดมินเพื่อแสดงอ็อบเจ็กต์เพียงอย่างเดียว."
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:27
 msgid "Edit this object (new window)"
@@ -1094,7 +1097,7 @@ msgstr "แก้ไขออปเจ็กนี้ (หน้าใหม่)
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:28
 msgid "As above, but opens the admin page in a new window."
-msgstr "เหมือนด้านบน แต่เปิดหน้าต่างผู้ดูแลระบบขึ้นมาใหม่"
+msgstr "เหมือนด้านบน แต่เปิดหน้าต่างผู้ดูแลระบบในหน้าต่างใหม่"
 
 #: contrib/auth/admin.py:21
 msgid "Personal info"
@@ -1114,7 +1117,7 @@ msgstr "กลุ่ม"
 
 #: contrib/auth/admin.py:64
 msgid "Add user"
-msgstr "เพิ่มผู้ใช้งาน"
+msgstr "เพิ่มผู้ใช้"
 
 #: contrib/auth/admin.py:90
 msgid "Password changed successfully."
@@ -1152,7 +1155,7 @@ msgstr "รหัสผ่านไม่ตรงกัน"
 
 #: contrib/auth/forms.py:82
 msgid "This account is inactive."
-msgstr "ชื่อผู้ใช้นี้ไม่สามารถใช้งานได้"
+msgstr "บัญชีนี้ไม่ทำงาน"
 
 #: contrib/auth/forms.py:87
 msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
@@ -1164,7 +1167,7 @@ msgstr "อีเมล"
 
 #: contrib/auth/forms.py:109
 msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?"
-msgstr "อีเมลนั้นไม่สามารถเข้าสู่ระบบได้ คุณแน่ใจหรือว่าคุณได้ลงทะเบียนแล้ว"
+msgstr "อีเมลนี้ไม่ตรงกับบัญชีใดๆในระบบ คุณแน่ใจหรือว่าคุณได้ลงทะเบียนแล้ว"
 
 #: contrib/auth/forms.py:134
 #, python-format
@@ -1228,7 +1231,7 @@ msgstr "นามสกุล"
 
 #: contrib/auth/models.py:139
 msgid "e-mail address"
-msgstr "ที่อยู่อีเมล"
+msgstr "อีเมล"
 
 #: contrib/auth/models.py:140
 msgid "password"
@@ -1236,11 +1239,11 @@ msgstr "รหัสผ่าน"
 
 #: contrib/auth/models.py:140
 msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
-msgstr "ใช้ '[algo]$[salt]$[hexdigest]' หรือใช้ <a href=\"password/\">แบบฟอร์มเปลี่ยนรหัสผ่าน </a>."
+msgstr "ใช้ '[algo]$[salt]$[hexdigest]'หรือใช้ <a href=\"password/\">แบบฟอร์มเปลี่ยนรหัสผ่าน </a>."
 
 #: contrib/auth/models.py:141
 msgid "staff status"
-msgstr "สถานะ"
+msgstr "สถานะของพนักงาน"
 
 #: contrib/auth/models.py:141
 msgid "Designates whether the user can log into this admin site."
@@ -1252,7 +1255,7 @@ msgstr "ใช้งานได้"
 
 #: contrib/auth/models.py:142
 msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
-msgstr "ผู้ที่ถูกเลือกนั้นต้องมีสถานะที่สามารถเข้ามาใช้งานได้ตลอดเวลา เลือกออกแทนที่จะลบชื่อผู้ใช้ทิ้งไป "
+msgstr "กำหนดให้ผู้ใช้มีสถานะที่สามารถเข้ามาใช้งานได้ เลือกออกแทนที่จะลบชื่อผู้ใช้ทิ้งไป "
 
 #: contrib/auth/models.py:143
 msgid "superuser status"
@@ -1260,7 +1263,7 @@ msgstr "สถานะผู้ใช้พิเศษ"
 
 #: contrib/auth/models.py:143
 msgid "Designates that this user has all permissions without explicitly assigning them."
-msgstr "ชื่อผู้ใช้งานที่ถูกเลือกนั้นได้รับอนุญาตในทุกกรณีโดยไม่ต้องการมอบหมายอย่างเป็นทางการ"
+msgstr "กำหนดสิทธิ์ทุกอย่างให้ผู้ใช้ โดยไม่ต้องการมอบหมายอย่างเป็นทางการ"
 
 #: contrib/auth/models.py:144
 msgid "last login"
@@ -1272,19 +1275,19 @@ msgstr "วันที่เข้าร่วม"
 
 #: contrib/auth/models.py:147
 msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
-msgstr "ดังนั้นการอนุญาตที่ได้รับมอบหมาย ผู้ใช้งานนี้ยังได้รับสิทธิ์ให้ใช้อำนาจได้กับกลุ่มของตนเองอีกด้วย"
+msgstr "ด้วยสิทธิ์ที่ได้รับ ผู้ใช้นี้ยังได้รับสิทธิ์ให้ใช้อำนาจได้กับกลุ่มของตนเองอีกด้วย"
 
 #: contrib/auth/models.py:148
 msgid "user permissions"
-msgstr "สิทธิ์ผู้ใช้งาน"
+msgstr "สิทธิ์ของผู้ใช้"
 
 #: contrib/auth/models.py:152
 msgid "user"
-msgstr "ผู้ใช้งาน"
+msgstr "ผู้ใช้"
 
 #: contrib/auth/models.py:153
 msgid "users"
-msgstr "ผู้ใช้งาน"
+msgstr "ผู้ใช้"
 
 #: contrib/auth/models.py:308
 msgid "message"
@@ -1313,7 +1316,7 @@ msgstr "ชื่อ"
 
 #: contrib/comments/forms.py:21
 msgid "Email address"
-msgstr "ที่อยู่อีเมล"
+msgstr "อีเมล"
 
 #: contrib/comments/forms.py:23
 msgid "Comment"
@@ -1324,13 +1327,13 @@ msgid "If you enter anything in this field your comment will be treated as spam"
 msgstr "ถ้าคุณใส่ข้อมูลใดๆ ก็ตามในส่วนนี้ มันจะกลายเป็นสแปม"
 
 #: contrib/comments/forms.py:126
-#, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
-msgstr "ระวังนะ! คำว่า %s ไม่ได้รับอนุญาตให้ใช้ที่นี่"
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] "ระวังนะ ไม่สามารถใช้คำว่า %s ที่นี่ได้"
 
 #: contrib/comments/models.py:23
 msgid "object ID"
-msgstr "อ็อบเจ็กไอดี"
+msgstr "อ็อบเจ็กต์ไอดี"
 
 #: contrib/comments/models.py:50
 msgid "user's name"
@@ -1338,7 +1341,7 @@ msgstr "ชื่อของผู้ใช้"
 
 #: contrib/comments/models.py:51
 msgid "user's email address"
-msgstr "ที่อยู่อีเมลของผู้ใช้"
+msgstr "อีเมลของผู้ใช้"
 
 #: contrib/comments/models.py:52
 msgid "user's URL"
@@ -1370,11 +1373,11 @@ msgstr "เลือกเมื่อเห็นว่าข้อคิดเ
 
 #: contrib/comments/models.py:115
 msgid "This comment was posted by an authenticated user and thus the name is read-only."
-msgstr "ข้อคิดเห็นนี้ได้ถูกเขียนไว้โดยผู้ใช้งานที่สามารถเชื่อถือได้ จะถูกอ่านได้เพียงอย่างเดียว"
+msgstr "ข้อคิดเห็นนี้ได้ถูกเขียนไว้โดยผู้ใช้ที่สามารถเชื่อถือได้ จะถูกอ่านได้เพียงอย่างเดียว"
 
 #: contrib/comments/models.py:124
 msgid "This comment was posted by an authenticated user and thus the email is read-only."
-msgstr "ข้อคิดเห็นนี้ถูกเขียนไว้โดยผู้ใช้งานที่สามารถเชื่อถือได้ ดังนั้นอีเมลนั้นจะถูกอ่านเท่านั้น"
+msgstr "ข้อคิดเห็นนี้ถูกเขียนไว้โดยผู้ใช้ที่สามารถเชื่อถือได้ ดังนั้นอีเมลนั้นจะถูกอ่านเท่านั้น"
 
 #: contrib/comments/models.py:149
 #, python-format
@@ -1405,11 +1408,11 @@ msgstr "content types"
 
 #: contrib/flatpages/admin.py:9
 msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "ตัวอย่าง: '/about/contact/'. ต้องแน่ใจว่าขึ้นต้นและลงท้ายด้วยเครื่องหมายขีดทับ (/)"
+msgstr "ตัวอย่าง: '/about/contact/'. ต้องแน่ใจว่าขึ้นต้นและลงท้ายด้วยเครื่องหมาย /"
 
 #: contrib/flatpages/admin.py:11
 msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
-msgstr "ค่าที่ว่านี้จะต้องประกอบด้วยตัวหน้งสือ ตัวเลข เครื่องหมายขีดล่าง หรือขีดทับ(/)"
+msgstr "ค่าที่ว่านี้จะต้องประกอบด้วยตัวหน้งสือ ตัวเลข เครื่องหมายขีดล่าง และขีดทับ"
 
 #: contrib/flatpages/admin.py:22
 msgid "Advanced options"
@@ -1433,15 +1436,15 @@ msgstr "ชื่อเทมเพลต"
 
 #: contrib/flatpages/models.py:12
 msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."
-msgstr "ตัวอย่าง: 'flatpages/contact_page.html'ถ้าไม่ได้ถูกนำเสนอ ระบบจะใช้ 'flatpages/default.html' "
+msgstr "ตัวอย่าง: 'flatpages/contact_page.html' ถ้าไม่ได้ถูกใช้ ระบบจะใช้ 'flatpages/default.html' "
 
 #: contrib/flatpages/models.py:13
 msgid "registration required"
-msgstr "ต้องการการลงทะเบียน"
+msgstr "ต้องลงทะเบียนก่อน"
 
 #: contrib/flatpages/models.py:13
 msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "ถ้าถูกเลือก ผู้ใช้งานที่ลงทะเบียนเข้าสู่ระบบเท่านั้นที่จะสามารถดูหน้านี้"
+msgstr "ถ้าถูกเลือก ผู้ใช้ที่ลงทะเบียนเข้าสู่ระบบเท่านั้นที่จะสามารถดูหน้านี้"
 
 #: contrib/flatpages/models.py:18
 msgid "flat page"
@@ -1449,7 +1452,7 @@ msgstr "flat page"
 
 #: contrib/flatpages/models.py:19
 msgid "flat pages"
-msgstr ""
+msgstr "flat page"
 
 #: contrib/formtools/wizard.py:130
 msgid "We apologize, but your form has expired. Please continue filling out the form from this page."
@@ -1484,19 +1487,19 @@ msgid "rd"
 msgstr "rd"
 
 #: contrib/humanize/templatetags/humanize.py:51
-#, python-format
 msgid "%(value).1f million"
-msgstr "%(value).1f ล้าน"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f หนึ่งล้าน"
 
 #: contrib/humanize/templatetags/humanize.py:54
-#, python-format
 msgid "%(value).1f billion"
-msgstr "%(value).1f สิบล้าน"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f สิบล้าน"
 
 #: contrib/humanize/templatetags/humanize.py:57
-#, python-format
 msgid "%(value).1f trillion"
-msgstr "%(value).1f ร้อยล้าน"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f ร้อยล้าน"
 
 #: contrib/humanize/templatetags/humanize.py:73
 msgid "one"
@@ -1614,7 +1617,7 @@ msgstr "ใส่รหัสไปรษณีย์ในรูปแบบข
 
 #: contrib/localflavor/at/forms.py:48
 msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "ใส่หมายเลขบัตรประกันสังคมออสเตรีย ในรูปแบบ XXXX XXXXXX "
+msgstr "ใส่หมายเลขประกันสังคมออสเตรีย ในรูปแบบ XXXX XXXXXX "
 
 #: contrib/localflavor/au/forms.py:16
 msgid "Enter a 4 digit post code."
@@ -1638,7 +1641,7 @@ msgstr "ตัวเลข CPF ไม่สมบูรณ์"
 
 #: contrib/localflavor/br/forms.py:95
 msgid "This field requires at most 11 digits or 14 characters."
-msgstr "ในส่วนนี้ต้องการตัวเลขมากที่สุด 11 หรือ 14 ตัว"
+msgstr "ฟิลด์นี้ต้องการตัวเลขมากที่สุด 11 หรือ 14 ตัว"
 
 #: contrib/localflavor/br/forms.py:134
 msgid "Invalid CNPJ number."
@@ -1646,7 +1649,7 @@ msgstr "ตัวเลข CNPJ ไม่สมบูรณ์"
 
 #: contrib/localflavor/br/forms.py:136
 msgid "This field requires at least 14 digits"
-msgstr "ส่วนนี้ต้องการตัวเลขอย่างน้อย 14 ตัวเลข"
+msgstr "ฟิลด์นี้ต้องการตัวเลขอย่างน้อย 14 หลัก"
 
 #: contrib/localflavor/ca/forms.py:17
 msgid "Enter a postal code in the format XXX XXX."
@@ -1730,7 +1733,7 @@ msgstr "โซโลเธิร์น"
 
 #: contrib/localflavor/ch/ch_states.py:23
 msgid "St. Gallen"
-msgstr "เซนท์ กาลเลน"
+msgstr "เซนท์ กัลเลน"
 
 #: contrib/localflavor/ch/ch_states.py:24
 msgid "Thurgau"
@@ -1762,7 +1765,7 @@ msgstr "ซูริค"
 
 #: contrib/localflavor/ch/forms.py:64
 msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
-msgstr "ใส่หมายเลขบัตรประชาชนสวิสต์หรือหมายเลขพาสปอร์ต ในรูปแบบ X1234567<0 หรือ 1234567890"
+msgstr "ใส่หมายเลขประจำตัวประชาชนหรือหมายเลขพาสปอร์ต ในรูปแบบ X1234567<0 หรือ 1234567890"
 
 #: contrib/localflavor/cl/forms.py:29
 msgid "Enter a valid Chilean RUT."
@@ -1810,7 +1813,7 @@ msgstr "เม็กเลนเบิร์กตะวันตก-โพเ
 
 #: contrib/localflavor/de/de_states.py:13
 msgid "Lower Saxony"
-msgstr "แซกโซนี ต่ำ"
+msgstr "แซกโซนีล่าง"
 
 #: contrib/localflavor/de/de_states.py:14
 msgid "North Rhine-Westphalia"
@@ -1848,7 +1851,7 @@ msgstr "ใส่รหัสไปรษณ๊ย์ ในรูปแบบ X
 
 #: contrib/localflavor/de/forms.py:41
 msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format."
-msgstr "ใส่หมายเลขบัตรประชาชนเยอรมันในรูปแบบ XXXXXXXXXXX-XXXXXXX-XXXXXXX-X"
+msgstr "ใส่หมายเลขประจำตัวประชาชนเยอรมันในรูปแบบ XXXXXXXXXXX-XXXXXXX-XXXXXXX-X"
 
 #: contrib/localflavor/es/es_provinces.py:5
 msgid "Arava"
@@ -1916,7 +1919,7 @@ msgstr "เกวงกา"
 
 #: contrib/localflavor/es/es_provinces.py:21
 msgid "Girona"
-msgstr "ชีโรนา"
+msgstr "จีโรนา"
 
 #: contrib/localflavor/es/es_provinces.py:22
 msgid "Granada"
@@ -1953,7 +1956,7 @@ msgstr "เยย์ดา"
 #: contrib/localflavor/es/es_provinces.py:30
 #: contrib/localflavor/es/es_regions.py:17
 msgid "La Rioja"
-msgstr "ลา ริโอจา"
+msgstr "ลา ริโอฮา"
 
 #: contrib/localflavor/es/es_provinces.py:31
 msgid "Lugo"
@@ -1966,7 +1969,7 @@ msgstr "มาดริด"
 
 #: contrib/localflavor/es/es_provinces.py:33
 msgid "Malaga"
-msgstr "มะยอกา"
+msgstr "มายอกา"
 
 #: contrib/localflavor/es/es_provinces.py:34
 msgid "Murcia"
@@ -1974,7 +1977,7 @@ msgstr "มูร์เซีย"
 
 #: contrib/localflavor/es/es_provinces.py:35
 msgid "Navarre"
-msgstr "นาบาร์รา"
+msgstr "นาวาร์"
 
 #: contrib/localflavor/es/es_provinces.py:36
 msgid "Ourense"
@@ -2007,7 +2010,7 @@ msgstr "ซานตาครูซ ดา เตริเนเฟ"
 #: contrib/localflavor/es/es_provinces.py:43
 #: contrib/localflavor/es/es_regions.py:11
 msgid "Cantabria"
-msgstr "ปอนเตเบดรา"
+msgstr "กันตาเบรีย"
 
 #: contrib/localflavor/es/es_provinces.py:44
 msgid "Segovia"
@@ -2155,7 +2158,7 @@ msgstr "ผลรวมตรวจสอบ สำหรับบัญชี
 
 #: contrib/localflavor/fi/forms.py:28
 msgid "Enter a valid Finnish social security number."
-msgstr "ใส่หมายเลขประกันสังคมของฟินแลนด์"
+msgstr "ใส่หมายเลขประกันสังคมฟินแลนด์"
 
 #: contrib/localflavor/in_/forms.py:14
 msgid "Enter a zip code in the format XXXXXXX."
@@ -2163,11 +2166,11 @@ msgstr "กรุณาใส่รหัสไปรษณีย์ในรู
 
 #: contrib/localflavor/is_/forms.py:17
 msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "ใส่หมายเลขประจำตัวประชาชนของไอซ์แลนด์ในรูปของ XXXXXX-XXXX"
+msgstr "ใส่หมายเลขประจำตัวประชาชนไอซ์แลนด์ในรูปของ XXXXXX-XXXX"
 
 #: contrib/localflavor/is_/forms.py:18
 msgid "The Icelandic identification number is not valid."
-msgstr "หมายเลขบัตรประจำตัวประชาชนของไอซ์แลนด์ไม่ถูกต้อง"
+msgstr "หมายเลขประจำตัวประชาชนไอซ์แลนด์ไม่ถูกต้อง"
 
 #: contrib/localflavor/it/forms.py:14
 msgid "Enter a valid zip code."
@@ -2175,7 +2178,7 @@ msgstr "ใส่รหัสไปรษณีย์"
 
 #: contrib/localflavor/it/forms.py:43
 msgid "Enter a valid Social Security number."
-msgstr "ใส่หมายเลขบัตรประกันสังคม"
+msgstr "ใส่หมายเลขประกันสังคม"
 
 #: contrib/localflavor/it/forms.py:68
 msgid "Enter a valid VAT number."
@@ -2379,7 +2382,7 @@ msgstr "อากวัสกาเลียนเตส"
 
 #: contrib/localflavor/mx/mx_states.py:13
 msgid "Baja California"
-msgstr "บาฮา กาลิฟอร์เนีย"
+msgstr "บาจา แคลิฟอร์เนีย"
 
 #: contrib/localflavor/mx/mx_states.py:14
 msgid "Baja California Sur"
@@ -2407,7 +2410,7 @@ msgstr "โคลิมา"
 
 #: contrib/localflavor/mx/mx_states.py:20
 msgid "Distrito Federal"
-msgstr "เมคีโก เด.เอเฟ. เฟเดอรัลดิสตริกต์"
+msgstr "เม็กซิโก ซิตี้"
 
 #: contrib/localflavor/mx/mx_states.py:21
 msgid "Durango"
@@ -2443,7 +2446,7 @@ msgstr "มอเรโลส"
 
 #: contrib/localflavor/mx/mx_states.py:29
 msgid "Nayarit"
-msgstr "Nayarit"
+msgstr "นายาริต"
 
 #: contrib/localflavor/mx/mx_states.py:30
 msgid "Nuevo León"
@@ -2511,7 +2514,7 @@ msgstr "ใส่หมายเลขโทรศัพท์"
 
 #: contrib/localflavor/nl/forms.py:78
 msgid "Enter a valid SoFi number"
-msgstr "กรอกหมายเลข SoFi ที่ถูต้อง"
+msgstr "กรอกหมายเลขประจำตัวประชาชน"
 
 #: contrib/localflavor/nl/nl_provinces.py:4
 msgid "Drenthe"
@@ -2523,7 +2526,7 @@ msgstr "เฟลโวแลนด์"
 
 #: contrib/localflavor/nl/nl_provinces.py:6
 msgid "Friesland"
-msgstr "ฟรีส์แลนด์"
+msgstr "ฟรายส์แลนด์"
 
 #: contrib/localflavor/nl/nl_provinces.py:7
 msgid "Gelderland"
@@ -2563,19 +2566,19 @@ msgstr "ซูด ฮอลแลนด์"
 
 #: contrib/localflavor/no/forms.py:33
 msgid "Enter a valid Norwegian social security number."
-msgstr "ใส่หมายเลขบัตรประกันสังคมของชาวนอร์เวย์"
+msgstr "ใส่หมายเลขประกันสังคมนอร์เวย์"
 
 #: contrib/localflavor/pe/forms.py:24
 msgid "This field requires 8 digits."
-msgstr "ฟิลด์นี้ต้องการตัวเลข 8 ตัว"
+msgstr "ข่องนี้ต้องการตัวเลข 8 ตัว"
 
 #: contrib/localflavor/pe/forms.py:52
 msgid "This field requires 11 digits."
-msgstr "ฟิลด์นี้ต้องการตัวเลข 11 ตัว"
+msgstr "ช่องนี้ต้องการตัวเลข 11 ตัว"
 
 #: contrib/localflavor/pl/forms.py:38
 msgid "National Identification Number consists of 11 digits."
-msgstr "บัตรประจำตัวประชาประกอบด้วยตัวเลข 11 หน่วย"
+msgstr "บัตรประจำตัวประชาประกอบด้วยตัวเลข 11 ตัว"
 
 #: contrib/localflavor/pl/forms.py:39
 msgid "Wrong checksum for the National Identification Number."
@@ -2583,7 +2586,7 @@ msgstr "ผลรวมตรวจสอบของหมายเลขปร
 
 #: contrib/localflavor/pl/forms.py:71
 msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
-msgstr "ใส่หมายเลขประจำตัวของผู้เสียภาษีอากรในรูปของ XXX-XXX-XX-XX หรือ XX-XX-XXX-XXX "
+msgstr "ใส่หมายเลขประจำตัวผู้เสียภาษี (NIP) ในรูปของ XXX-XXX-XX-XX หรือ XX-XX-XXX-XXX "
 
 #: contrib/localflavor/pl/forms.py:72
 msgid "Wrong checksum for the Tax Number (NIP)."
@@ -2639,7 +2642,7 @@ msgstr "ซับคาเพเทีย"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:17
 msgid "Podlasie"
-msgstr "พอดล่ซีย์"
+msgstr "พอดลาซีย์"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:18
 msgid "Pomerania"
@@ -3203,27 +3206,27 @@ msgstr "วอร์เซสเตอร์เชียร์"
 
 #: contrib/localflavor/uk/uk_regions.py:55
 msgid "County Antrim"
-msgstr "เขตการปกครอง แอนทริม"
+msgstr "แอนทริม"
 
 #: contrib/localflavor/uk/uk_regions.py:56
 msgid "County Armagh"
-msgstr "เขตการปกครอง อามาห์"
+msgstr "อามาห์"
 
 #: contrib/localflavor/uk/uk_regions.py:57
 msgid "County Down"
-msgstr "เขตการปกครอง ดาวน์"
+msgstr "ดาวน์"
 
 #: contrib/localflavor/uk/uk_regions.py:58
 msgid "County Fermanagh"
-msgstr "เขตการปกครอง เฟอร์มานาห์"
+msgstr "เฟอร์มานาห์"
 
 #: contrib/localflavor/uk/uk_regions.py:59
 msgid "County Londonderry"
-msgstr "เขตการปกครอง ลอนดอนเดอร์รี่"
+msgstr "ลอนดอนเดอร์รี่"
 
 #: contrib/localflavor/uk/uk_regions.py:60
 msgid "County Tyrone"
-msgstr "เขตการปกครอง ไทโรน"
+msgstr "ไทโรน"
 
 #: contrib/localflavor/uk/uk_regions.py:64
 msgid "Clwyd"
@@ -3327,11 +3330,11 @@ msgstr "ใส่รหัสไปรษณีย์ในรูปของ XX
 
 #: contrib/localflavor/us/forms.py:54
 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "ใส่หมายเลขบัตรประกันสังคมของอเมริกา"
+msgstr "ใส่หมายเลขประกันสังคมอเมริกา"
 
 #: contrib/localflavor/za/forms.py:20
 msgid "Enter a valid South African ID number"
-msgstr "ใส่หมายเลขบัตรประจำตัวประชาชนของแอฟริกาใต้"
+msgstr "ใส่หมายเลขประจำตัวประชาชนแอฟริกาใต้"
 
 #: contrib/localflavor/za/forms.py:54
 msgid "Enter a valid South African postal code"
@@ -3343,7 +3346,7 @@ msgstr "อิสเทิร์นแคป"
 
 #: contrib/localflavor/za/za_provinces.py:5
 msgid "Free State"
-msgstr "ฟรีเสตต"
+msgstr "ฟรีเสตต์"
 
 #: contrib/localflavor/za/za_provinces.py:6
 msgid "Gauteng"
@@ -3379,7 +3382,7 @@ msgstr "เปลี่ยนทิศทางจาก"
 
 #: contrib/redirects/models.py:8
 msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "สิ่งนี้น่าจะเป็นแนวทางที่แน่นอนที่จะแยกออกมาจากชื่อโดเมน ตัวอย่าง : '/events/search/'"
+msgstr "พาธไม่รวมโดเมน ตัวอย่าง : '/events/search/'"
 
 #: contrib/redirects/models.py:9
 msgid "redirect to"
@@ -3387,7 +3390,7 @@ msgstr "เปลี่ยนทิศทางไปที่"
 
 #: contrib/redirects/models.py:10
 msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
-msgstr "มันอาจจะเป็นพาธที่แท้จริงหรือ URL แบบเต็มที่ขึ้นต้นด้วย 'http://'."
+msgstr "มันอาจจะเป็นพาธหรือ URL แบบเต็มที่ขึ้นต้นด้วย 'http://'."
 
 #: contrib/redirects/models.py:13
 msgid "redirect"
@@ -3403,11 +3406,11 @@ msgstr "เซสชันคีย์"
 
 #: contrib/sessions/models.py:47
 msgid "session data"
-msgstr "เซสชันดาตา"
+msgstr "ข้อมูลเซสชัน"
 
 #: contrib/sessions/models.py:48
 msgid "expire date"
-msgstr "expire date"
+msgstr "วันหมดอายุ"
 
 #: contrib/sessions/models.py:53
 msgid "session"
@@ -3436,24 +3439,24 @@ msgstr "ค่านี้ต้องเป็นจำนวนเต็ม"
 
 #: db/models/fields/__init__.py:379
 msgid "This value must be either True or False."
-msgstr "ค่านี้ต้องเป็น True หรือ False"
+msgstr "ค่านี้ต้องเป็นถูกหรือผิด"
 
 #: db/models/fields/__init__.py:412
 msgid "This field cannot be null."
-msgstr "ฟิลด์นี้จำเป็น"
+msgstr "ฟิลด์นี้ไม่สารถปล่อยว่างได้"
 
 #: db/models/fields/__init__.py:428
 msgid "Enter only digits separated by commas."
-msgstr "ใส่ตัวเลขหรือลูกน้ำเท่านั้น"
+msgstr "ใส่ตัวเลขที่คั่นด้วยจุลภาคเท่านั้น"
 
 #: db/models/fields/__init__.py:459
 msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Enter a valid date in YYYY-MM-DD format."
+msgstr "ใส่วันที่ในรูปแบบ YYYY-MM-DD"
 
 #: db/models/fields/__init__.py:468
 #, python-format
 msgid "Invalid date: %s"
-msgstr "Invalid date: %s"
+msgstr "วันที่ไม่ถูกต้อง: %s"
 
 #: db/models/fields/__init__.py:532
 #: db/models/fields/__init__.py:550
@@ -3462,7 +3465,7 @@ msgstr "ใส่วันเวลาที่ถูกต้องในรู
 
 #: db/models/fields/__init__.py:586
 msgid "This value must be a decimal number."
-msgstr "ช่องนี้ต้องเป็นเลขฐานสิบ"
+msgstr "ค่านี้ต้องเป็นเลขฐานสิบหรือเลขทศนิยม"
 
 #: db/models/fields/__init__.py:719
 msgid "This value must be either None, True or False."
@@ -3481,8 +3484,7 @@ msgstr "กดปุ่ม \"Control\", หรือ \"Command\" บน Mac ค
 #, 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] ""
+msgstr[0] "โปรดใส่ %(self)s ไอดี. ค่า %(value)r ไม่ถูกต้อง"
 
 #: forms/fields.py:54
 msgid "This field is required."
@@ -3533,12 +3535,12 @@ msgstr "แน่ใจว่ารวมแล้วไม่เกิน %s 
 #: forms/fields.py:228
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
-msgstr "แน่ใจว่ารวมแล้วไม่เกิน %s หลัก."
+msgstr "แน่ใจว่ารวมแล้วเป็นทศนิยมไม่เกิน %s หลัก."
 
 #: forms/fields.py:229
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Ensure that there are no more than %s digits before the decimal point."
+msgstr "แน่ใจว่ารวมแล้วไม่เกิน %s หลัก ก่อนจุดทศนิยม."
 
 #: forms/fields.py:287
 #: forms/fields.py:848
@@ -3568,7 +3570,7 @@ msgstr "ไฟล์ที่ส่งว่างเปล่า"
 
 #: forms/fields.py:477
 msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "อัพโหลดไฟล์ที่ถูกต้อง. ไฟล์ที่อัพโหลดไปไม่ใช่รูป หรือรูปเสียหาย."
+msgstr "อัพโหลดรูปที่ถูกต้อง. ไฟล์ที่อัพโหลดไปไม่ใช่รูป หรือรูปเสียหาย."
 
 #: forms/fields.py:538
 msgid "Enter a valid URL."
@@ -3582,7 +3584,7 @@ msgstr "URL อาจจะเป็นลิ้งค์ที่เสีย
 #: forms/fields.py:696
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "เลือกตัวเลือกที่ถูกต้อง. %(value)s ไม่ใช่ตัวเลือกที่ถูกต้อง."
+msgstr "เลือกตัวเลือกที่ถูกต้อง. %(value)s ไม่ใช่ตัวเลือกที่ใช้ได้."
 
 #: forms/fields.py:697
 #: forms/fields.py:758
@@ -3623,11 +3625,9 @@ msgid "yes,no,maybe"
 msgstr "ใช่,ไม่ใช่,อาจจะ"
 
 #: template/defaultfilters.py:737
-#, fuzzy, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(size)d ไบต์"
 
 #: template/defaultfilters.py:739
 #, python-format
@@ -3779,7 +3779,7 @@ msgstr "ธันวาคม"
 
 #: utils/dates.py:23
 msgid "jan"
-msgstr "มก."
+msgstr "ม.ค."
 
 #: utils/dates.py:23
 msgid "feb"
@@ -3827,7 +3827,7 @@ msgstr "ธ.ค."
 
 #: utils/dates.py:31
 msgid "Jan."
-msgstr "มก."
+msgstr "ม.ค."
 
 #: utils/dates.py:31
 msgid "Feb."
@@ -3858,57 +3858,54 @@ msgid "or"
 msgstr "หรือ"
 
 #: utils/timesince.py:21
+msgid "year"
+msgid_plural "years"
+msgstr[0] "ปี"
+
 #: utils/timesince.py:22
 msgid "month"
 msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "เดือน"
 
 #: utils/timesince.py:23
 msgid "week"
 msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "สัปดาห์"
 
 #: utils/timesince.py:24
 msgid "day"
 msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "วัน"
 
 #: utils/timesince.py:25
 msgid "hour"
 msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ชั่วโมง"
 
 #: utils/timesince.py:26
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "นาที"
 
 #: utils/timesince.py:43
 msgid "minutes"
 msgstr "นาที"
 
 #: utils/timesince.py:48
-#, python-format
 msgid "%(number)d %(type)s"
-msgstr ""
+msgstr "%(number)d %(type)s"
 
 #: utils/timesince.py:54
-#, python-format
 msgid ", %(number)d %(type)s"
-msgstr ""
+msgstr ", %(number)d %(type)s"
 
 #: utils/translation/trans_real.py:403
 msgid "DATE_FORMAT"
-msgstr "N j, Y"
+msgstr "j N Y"
 
 #: utils/translation/trans_real.py:405
 msgid "TIME_FORMAT"
-msgstr "P"
+msgstr "G:i"
 
 #: utils/translation/trans_real.py:421
 msgid "YEAR_MONTH_FORMAT"
@@ -3916,7 +3913,7 @@ msgstr "F Y"
 
 #: utils/translation/trans_real.py:422
 msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+msgstr "j F"
 
 #: views/generic/create_update.py:114
 #, python-format
diff --git a/django/conf/locale/th/LC_MESSAGES/djangojs.mo b/django/conf/locale/th/LC_MESSAGES/djangojs.mo
index a5e0b4f379..f999fd0303 100644
Binary files a/django/conf/locale/th/LC_MESSAGES/djangojs.mo and b/django/conf/locale/th/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/th/LC_MESSAGES/djangojs.po b/django/conf/locale/th/LC_MESSAGES/djangojs.po
index fcc346f8fe..461cdf264d 100644
--- a/django/conf/locale/th/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/th/LC_MESSAGES/djangojs.po
@@ -2,23 +2,24 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: kowito@felspar.com\n"
+"Project-Id-Version: Django-1.1-rc-1\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-02 22:36-0700\n"
-"PO-Revision-Date: 2008-11-04 00:35+0700\n"
+"PO-Revision-Date: 2009-07-27 21:47+0700\n"
 "Last-Translator: Kowit Charoenratchatabhan <kowito@felspar.com>\n"
 "Language-Team: Kowit Charoenratchatabhan,Kadsarin Sanjek, Felspar <kowito@felspar.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Thai\n"
-"X-Poedit-Country: Thailand\n"
+"X-Poedit-Country: THAILAND\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: contrib/admin/media/js/SelectFilter2.js:33
 #, perl-format
 msgid "Available %s"
-msgstr "ที่มีอยู่ %s"
+msgstr "%sที่มีอยู่"
 
 #: contrib/admin/media/js/SelectFilter2.js:41
 msgid "Choose all"
@@ -35,7 +36,7 @@ msgstr "ลบออก"
 #: contrib/admin/media/js/SelectFilter2.js:53
 #, perl-format
 msgid "Chosen %s"
-msgstr "ได้เลือก %s"
+msgstr "%sที่ถูกเลือก"
 
 #: contrib/admin/media/js/SelectFilter2.js:54
 msgid "Select your choice(s) and click "
@@ -43,7 +44,7 @@ msgstr "เลือกและคลิก"
 
 #: contrib/admin/media/js/SelectFilter2.js:59
 msgid "Clear all"
-msgstr "ล้างทั้งหมด"
+msgstr "ลบทั้งหมด"
 
 #: contrib/admin/media/js/calendar.js:24
 #: contrib/admin/media/js/dateparse.js:32
@@ -52,11 +53,11 @@ msgstr "มกราคม กุมภาพันธ์ มีนาคม เ
 
 #: contrib/admin/media/js/calendar.js:25
 msgid "S M T W T F S"
-msgstr "อา จ. อ. พ. พฤ. ศ. ส."
+msgstr "อา. จ. อ. พ. พฤ. ศ. ส."
 
 #: contrib/admin/media/js/dateparse.js:33
 msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "อาทิตย์ จันทร์ อังคาร พุธ พฤหัส ศุกร์ เสาร์"
+msgstr "อาทิตย์ จันทร์ อังคาร พุธ พฤหัสบดี ศุกร์ เสาร์"
 
 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
@@ -70,7 +71,7 @@ msgstr "ซ่อน"
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
 msgid "Now"
-msgstr "เดี๋ยวนี้"
+msgstr "ขณะนี้"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
 msgid "Clock"
@@ -86,11 +87,11 @@ msgstr "เที่ยงคืน"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
 msgid "6 a.m."
-msgstr "6 นาฬิกา"
+msgstr "หกโมงเช้า"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
 msgid "Noon"
-msgstr "เที่ยง"
+msgstr "เที่ยงวัน"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
@@ -108,7 +109,7 @@ msgstr "ปฏิทิน"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
 msgid "Yesterday"
-msgstr "เมื่อวานนี้"
+msgstr "เมื่อวาน"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
 msgid "Tomorrow"
diff --git a/django/contrib/gis/db/models/query.py b/django/contrib/gis/db/models/query.py
index d055260a58..ad2cd8ceda 100644
--- a/django/contrib/gis/db/models/query.py
+++ b/django/contrib/gis/db/models/query.py
@@ -125,11 +125,19 @@ class GeoQuerySet(QuerySet):
         if not isinstance(precision, (int, long)):
             raise TypeError('Precision keyword must be set with an integer.')
         
-        # Setting the options flag 
-        options = 0
-        if crs and bbox: options = 3
-        elif crs: options = 1
-        elif bbox: options = 2
+        # Setting the options flag -- which depends on which version of
+        # PostGIS we're using.
+        major, minor1, minor2 = SpatialBackend.version
+        if major >=1 and (minor1 >= 4):
+            options = 0
+            if crs and bbox: options = 3
+            elif bbox: options = 1
+            elif crs: options = 2
+        else:
+            options = 0
+            if crs and bbox: options = 3
+            elif crs: options = 1
+            elif bbox: options = 2
         s = {'desc' : 'GeoJSON', 
              'procedure_args' : {'precision' : precision, 'options' : options},
              'procedure_fmt' : '%(geo_col)s,%(precision)s,%(options)s',
diff --git a/django/contrib/gis/tests/geoapp/tests.py b/django/contrib/gis/tests/geoapp/tests.py
index 1eaed196b0..8bf4990fe9 100644
--- a/django/contrib/gis/tests/geoapp/tests.py
+++ b/django/contrib/gis/tests/geoapp/tests.py
@@ -148,15 +148,16 @@ class GeoModelTest(unittest.TestCase):
         ptown1 = City.objects.gml(field_name='point', precision=9).get(name='Pueblo')
         ptown2 = City.objects.gml(precision=9).get(name='Pueblo')
 
+        import re
         if SpatialBackend.oracle:
             # No precision parameter for Oracle :-/
-            import re
-            gml_regex = re.compile(r'<gml:Point srsName="SDO:4326" xmlns:gml="http://www.opengis.net/gml"><gml:coordinates decimal="\." cs="," ts=" ">-104.60925\d+,38.25500\d+ </gml:coordinates></gml:Point>')
+            gml_regex = re.compile(r'^<gml:Point srsName="SDO:4326" xmlns:gml="http://www.opengis.net/gml"><gml:coordinates decimal="\." cs="," ts=" ">-104.60925\d+,38.25500\d+ </gml:coordinates></gml:Point>')
             for ptown in [ptown1, ptown2]:
-                self.assertEqual(True, bool(gml_regex.match(ptown.gml)))
+                self.failUnless(gml_regex.match(ptown.gml))
         else:
+            gml_regex = re.compile(r'^<gml:Point srsName="EPSG:4326"><gml:coordinates>-104\.60925\d+,38\.255001</gml:coordinates></gml:Point>')
             for ptown in [ptown1, ptown2]:
-                self.assertEqual('<gml:Point srsName="EPSG:4326"><gml:coordinates>-104.609252,38.255001</gml:coordinates></gml:Point>', ptown.gml)
+                self.failUnless(gml_regex.match(ptown.gml))
 
     @no_spatialite
     @no_oracle
@@ -167,28 +168,38 @@ class GeoModelTest(unittest.TestCase):
         if not SpatialBackend.geojson:
             return
 
+        major, minor1, minor2 = SpatialBackend.version
+        if major >=1 and minor1 >= 4:
+            pueblo_json = '{"type":"Point","coordinates":[-104.609252,38.255001]}'
+            houston_json = '{"type":"Point","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"coordinates":[-95.363151,29.763374]}'
+            victoria_json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.305196,48.462611]}'
+            chicago_json = '{"type":"Point","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}'
+        else:
+            pueblo_json = '{"type":"Point","coordinates":[-104.60925200,38.25500100]}'
+            houston_json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"coordinates":[-95.36315100,29.76337400]}'
+            victoria_json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.30519600,48.46261100]}'
+            chicago_json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}'
+            
         # Precision argument should only be an integer
         self.assertRaises(TypeError, City.objects.geojson, precision='foo')
         
         # Reference queries and values.
         # SELECT ST_AsGeoJson("geoapp_city"."point", 8, 0) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Pueblo';
-        json = '{"type":"Point","coordinates":[-104.60925200,38.25500100]}'
-        self.assertEqual(City.objects.geojson().get(name='Pueblo').geojson, json)
+        self.assertEqual(pueblo_json, City.objects.geojson().get(name='Pueblo').geojson)
 
-        # SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
-        json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"coordinates":[-95.36315100,29.76337400]}'
+        # 1.3.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
+        # 1.4.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
         # This time we want to include the CRS by using the `crs` keyword.
-        self.assertEqual(City.objects.geojson(crs=True, model_att='json').get(name='Houston').json, json)
+        self.assertEqual(houston_json, City.objects.geojson(crs=True, model_att='json').get(name='Houston').json)
 
-        # SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Victoria';
-        json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.30519600,48.46261100]}'
+        # 1.3.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Victoria';
+        # 1.4.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
         # This time we include the bounding box by using the `bbox` keyword.
-        self.assertEqual(City.objects.geojson(bbox=True).get(name='Victoria').geojson, json)
+        self.assertEqual(victoria_json, City.objects.geojson(bbox=True).get(name='Victoria').geojson)
 
-        # SELECT ST_AsGeoJson("geoapp_city"."point", 5, 3) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Chicago';
-        json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}'
+        # 1.(3|4).x: SELECT ST_AsGeoJson("geoapp_city"."point", 5, 3) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Chicago';
         # Finally, we set every available keyword.
-        self.assertEqual(City.objects.geojson(bbox=True, crs=True, precision=5).get(name='Chicago').geojson, json)
+        self.assertEqual(chicago_json, City.objects.geojson(bbox=True, crs=True, precision=5).get(name='Chicago').geojson)
         
     @no_oracle
     def test03d_svg(self):
diff --git a/django/contrib/gis/tests/relatedapp/tests.py b/django/contrib/gis/tests/relatedapp/tests.py
index 60528f177c..b9039ea44b 100644
--- a/django/contrib/gis/tests/relatedapp/tests.py
+++ b/django/contrib/gis/tests/relatedapp/tests.py
@@ -39,10 +39,7 @@ class RelatedGeoModelTest(unittest.TestCase):
         "Testing the `transform` GeoQuerySet method on related geographic models."
         # All the transformations are to state plane coordinate systems using
         # US Survey Feet (thus a tolerance of 0 implies error w/in 1 survey foot).
-        if SpatialBackend.postgis:
-            tol = 3
-        else:
-            tol = 0
+        tol = 0
 
         def check_pnt(ref, pnt):
             self.assertAlmostEqual(ref.x, pnt.x, tol)
diff --git a/django/contrib/gis/tests/test_spatialrefsys.py b/django/contrib/gis/tests/test_spatialrefsys.py
index 4b1cc093eb..dd2c10f7e8 100644
--- a/django/contrib/gis/tests/test_spatialrefsys.py
+++ b/django/contrib/gis/tests/test_spatialrefsys.py
@@ -1,4 +1,5 @@
 import unittest
+from django.contrib.gis.db.backend import SpatialBackend
 from django.contrib.gis.tests.utils import mysql, no_mysql, oracle, postgis, spatialite
 if not mysql:
     from django.contrib.gis.models import SpatialRefSys
@@ -7,6 +8,7 @@ test_srs = ({'srid' : 4326,
              'auth_name' : ('EPSG', True),
              'auth_srid' : 4326,
              'srtext' : 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]',
+             'srtext14' : 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]',
              'proj4' : '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ',
              'spheroid' : 'WGS 84', 'name' : 'WGS 84', 
              'geographic' : True, 'projected' : False, 'spatialite' : True,
@@ -17,6 +19,7 @@ test_srs = ({'srid' : 4326,
              'auth_name' : ('EPSG', False),
              'auth_srid' : 32140,
              'srtext' : 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",30.28333333333333],PARAMETER["standard_parallel_2",28.38333333333333],PARAMETER["latitude_of_origin",27.83333333333333],PARAMETER["central_meridian",-99],PARAMETER["false_easting",600000],PARAMETER["false_northing",4000000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","32140"]]',
+             'srtext14': 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",30.28333333333333],PARAMETER["standard_parallel_2",28.38333333333333],PARAMETER["latitude_of_origin",27.83333333333333],PARAMETER["central_meridian",-99],PARAMETER["false_easting",600000],PARAMETER["false_northing",4000000],AUTHORITY["EPSG","32140"],AXIS["X",EAST],AXIS["Y",NORTH]]',
              'proj4' : '+proj=lcc +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lat_0=27.83333333333333 +lon_0=-99 +x_0=600000 +y_0=4000000 +ellps=GRS80 +datum=NAD83 +units=m +no_defs ',
              'spheroid' : 'GRS 1980', 'name' : 'NAD83 / Texas South Central',
              'geographic' : False, 'projected' : True, 'spatialite' : False,
@@ -25,6 +28,10 @@ test_srs = ({'srid' : 4326,
              },
             )
 
+if SpatialBackend.postgis:
+    major, minor1, minor2 = SpatialBackend.version
+    POSTGIS_14 = major >=1 and minor1 >= 4
+
 class SpatialRefSysTest(unittest.TestCase):
 
     @no_mysql
@@ -45,7 +52,11 @@ class SpatialRefSysTest(unittest.TestCase):
 
             # No proj.4 and different srtext on oracle backends :(
             if postgis:
-                self.assertEqual(sd['srtext'], srs.wkt)
+                if POSTGIS_14:
+                    srtext = sd['srtext14']
+                else:
+                    srtext = sd['srtext']
+                self.assertEqual(srtext, srs.wkt)
                 self.assertEqual(sd['proj4'], srs.proj4text)
 
     @no_mysql
@@ -68,7 +79,11 @@ class SpatialRefSysTest(unittest.TestCase):
                 self.assertEqual(sd['proj4'], srs.proj4)
                 # No `srtext` field in the `spatial_ref_sys` table in SpatiaLite
                 if not spatialite:
-                    self.assertEqual(sd['srtext'], srs.wkt)
+                    if POSTGIS_14:
+                        srtext = sd['srtext14']
+                    else:
+                        srtext = sd['srtext']
+                    self.assertEqual(srtext, srs.wkt)
 
     @no_mysql
     def test03_ellipsoid(self):
diff --git a/django/core/management/commands/dumpdata.py b/django/core/management/commands/dumpdata.py
index 9172d938d2..7e05b89160 100644
--- a/django/core/management/commands/dumpdata.py
+++ b/django/core/management/commands/dumpdata.py
@@ -73,7 +73,8 @@ class Command(BaseCommand):
                 model_list = get_models(app)
 
             for model in model_list:
-                objects.extend(model._default_manager.all())
+                if not model._meta.proxy:
+                    objects.extend(model._default_manager.all())
 
         try:
             return serializers.serialize(format, objects, indent=indent)
diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py
index 16d75fd88b..fc2c694ab6 100644
--- a/django/core/management/commands/runserver.py
+++ b/django/core/management/commands/runserver.py
@@ -56,8 +56,7 @@ class Command(BaseCommand):
             translation.activate(settings.LANGUAGE_CODE)
 
             try:
-                path = admin_media_path or django.__path__[0] + '/contrib/admin/media'
-                handler = AdminMediaHandler(WSGIHandler(), path)
+                handler = AdminMediaHandler(WSGIHandler(), admin_media_path)
                 run(addr, int(port), handler)
             except WSGIServerException, e:
                 # Use helpful error messages instead of ugly tracebacks.
diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
index 44090a4516..9a5172967c 100644
--- a/django/core/servers/basehttp.py
+++ b/django/core/servers/basehttp.py
@@ -16,6 +16,7 @@ import sys
 import urllib
 
 from django.utils.http import http_date
+from django.utils._os import safe_join
 
 __version__ = "0.1"
 __all__ = ['WSGIServer','WSGIRequestHandler']
@@ -620,11 +621,25 @@ class AdminMediaHandler(object):
         self.application = application
         if not media_dir:
             import django
-            self.media_dir = django.__path__[0] + '/contrib/admin/media'
+            self.media_dir = \
+                os.path.join(django.__path__[0], 'contrib', 'admin', 'media')
         else:
             self.media_dir = media_dir
         self.media_url = settings.ADMIN_MEDIA_PREFIX
 
+    def file_path(self, url):
+        """
+        Returns the path to the media file on disk for the given URL.
+
+        The passed URL is assumed to begin with ADMIN_MEDIA_PREFIX.  If the
+        resultant file path is outside the media directory, then a ValueError
+        is raised.
+        """
+        # Remove ADMIN_MEDIA_PREFIX.
+        relative_url = url[len(self.media_url):]
+        relative_path = urllib.url2pathname(relative_url)
+        return safe_join(self.media_dir, relative_path)
+
     def __call__(self, environ, start_response):
         import os.path
 
@@ -635,19 +650,25 @@ class AdminMediaHandler(object):
             return self.application(environ, start_response)
 
         # Find the admin file and serve it up, if it exists and is readable.
-        relative_url = environ['PATH_INFO'][len(self.media_url):]
-        file_path = os.path.join(self.media_dir, relative_url)
+        try:
+            file_path = self.file_path(environ['PATH_INFO'])
+        except ValueError: # Resulting file path was not valid.
+            status = '404 NOT FOUND'
+            headers = {'Content-type': 'text/plain'}
+            output = ['Page not found: %s' % environ['PATH_INFO']]
+            start_response(status, headers.items())
+            return output
         if not os.path.exists(file_path):
             status = '404 NOT FOUND'
             headers = {'Content-type': 'text/plain'}
-            output = ['Page not found: %s' % file_path]
+            output = ['Page not found: %s' % environ['PATH_INFO']]
         else:
             try:
                 fp = open(file_path, 'rb')
             except IOError:
                 status = '401 UNAUTHORIZED'
                 headers = {'Content-type': 'text/plain'}
-                output = ['Permission denied: %s' % file_path]
+                output = ['Permission denied: %s' % environ['PATH_INFO']]
             else:
                 # This is a very simple implementation of conditional GET with
                 # the Last-Modified header. It makes media files a bit speedier
diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py
index 1ac75426c1..43f47048e0 100644
--- a/django/db/backends/creation.py
+++ b/django/db/backends/creation.py
@@ -40,7 +40,7 @@ class BaseDatabaseCreation(object):
         from django.db import models
 
         opts = model._meta
-        if not opts.managed:
+        if not opts.managed or opts.proxy:
             return [], {}
         final_output = []
         table_output = []
@@ -121,7 +121,7 @@ class BaseDatabaseCreation(object):
         "Returns any ALTER TABLE statements to add constraints after the fact."
         from django.db.backends.util import truncate_name
 
-        if not model._meta.managed:
+        if not model._meta.managed or model._meta.proxy:
             return []
         qn = self.connection.ops.quote_name
         final_output = []
@@ -236,7 +236,7 @@ class BaseDatabaseCreation(object):
 
     def sql_indexes_for_model(self, model, style):
         "Returns the CREATE INDEX SQL statements for a single model"
-        if not model._meta.managed:
+        if not model._meta.managed or model._meta.proxy:
             return []
         output = []
         for f in model._meta.local_fields:
@@ -268,7 +268,7 @@ class BaseDatabaseCreation(object):
 
     def sql_destroy_model(self, model, references_to_delete, style):
         "Return the DROP TABLE and restraint dropping statements for a single model"
-        if not model._meta.managed:
+        if not model._meta.managed or model._meta.proxy:
             return []
         # Drop the table now
         qn = self.connection.ops.quote_name
@@ -286,7 +286,7 @@ class BaseDatabaseCreation(object):
     def sql_remove_table_constraints(self, model, references_to_delete, style):
         from django.db.backends.util import truncate_name
 
-        if not model._meta.managed:
+        if not model._meta.managed or model._meta.proxy:
             return []
         output = []
         qn = self.connection.ops.quote_name
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index 687407a284..238dc63f71 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -326,8 +326,8 @@ shortcut. Here's the ``detail()`` view, rewritten::
         return render_to_response('polls/detail.html', {'poll': p})
 
 The :func:`~django.shortcuts.get_object_or_404` function takes a Django model
-module as its first argument and an arbitrary number of keyword arguments, which
-it passes to the module's :meth:`~django.db.models.QuerySet.get` function. It
+as its first argument and an arbitrary number of keyword arguments, which it
+passes to the module's :meth:`~django.db.models.QuerySet.get` function. It
 raises :exc:`~django.http.Http404` if the object doesn't exist.
 
 .. admonition:: Philosophy
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index c6509ece3d..7a0606dafe 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -188,6 +188,46 @@ almost always do the right thing and trying to override that will lead to
 errors that are difficult to track down. This feature is for advanced use
 only.
 
+Updating attributes based on existing fields
+--------------------------------------------
+
+Sometimes you'll need to perform a simple arithmetic task on a field, such
+as incrementing or decrementing the current value. The obvious way to
+achieve this is to do something like::
+
+    >>> product = Product.objects.get(name='Venezuelan Beaver Cheese')
+    >>> product.number_sold += 1
+    >>> product.save()
+
+If the old ``number_sold`` value retrieved from the database was 10, then
+the value of 11 will be written back to the database.
+
+This can be optimized slightly by expressing the update relative to the
+original field value, rather than as an explicit assignment of a new value.
+Django provides :ref:`F() expressions <query-expressions>` as a way of
+performing this kind of relative update. Using ``F()`` expressions, the
+previous example would be expressed as::
+
+    >>> from django.db.models import F
+    >>> product = Product.objects.get(name='Venezuelan Beaver Cheese')
+    >>> product.number_sold = F('number_sold') + 1
+    >>> product.save()
+
+This approach doesn't use the initial value from the database. Instead, it
+makes the database do the update based on whatever value is current at the
+time that the save() is executed.
+
+Once the object has been saved, you must reload the object in order to access
+the actual value that was applied to the updated field::
+
+    >>> product = Products.objects.get(pk=product.pk)
+    >>> print product.number_sold
+    42
+
+For more details, see the documentation on :ref:`F() expressions
+<query-expressions>` and their :ref:`use in update queries
+<topics-db-queries-update>`.
+
 Deleting objects
 ================
 
@@ -196,7 +236,7 @@ Deleting objects
    Issues a SQL ``DELETE`` for the object. This only deletes the object in the
    database; the Python instance will still be around, and will still have data
    in its fields.
-   
+
    For more details, including how to delete objects in bulk, see
    :ref:`topics-db-queries-delete`.
 
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 1744b66f40..f359ff4dda 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -3,7 +3,7 @@
 Release notes
 =============
 
-Releases notes for the official Django releases. Each release note will tell you
+Release notes for the official Django releases. Each release note will tell you
 what's new in each version, and will also describe any backwards-incompatible
 changes made in that version.
 
diff --git a/tests/modeltests/expressions/models.py b/tests/modeltests/expressions/models.py
index f29767a9d1..d4de5ccee9 100644
--- a/tests/modeltests/expressions/models.py
+++ b/tests/modeltests/expressions/models.py
@@ -80,4 +80,43 @@ Traceback (most recent call last):
 ...
 FieldError: Joined field references are not permitted in this query
 
+# F expressions can be used to update attributes on single objects
+>>> test_gmbh = Company.objects.get(name='Test GmbH')
+>>> test_gmbh.num_employees
+32
+>>> test_gmbh.num_employees = F('num_employees') + 4
+>>> test_gmbh.save()
+>>> test_gmbh = Company.objects.get(pk=test_gmbh.pk)
+>>> test_gmbh.num_employees
+36
+
+# F expressions cannot be used to update attributes which are foreign keys, or
+# attributes which involve joins.
+>>> test_gmbh.point_of_contact = None
+>>> test_gmbh.save()
+>>> test_gmbh.point_of_contact is None
+True
+>>> test_gmbh.point_of_contact = F('ceo')
+Traceback (most recent call last):
+...
+ValueError: Cannot assign "<django.db.models.expressions.F object at ...>": "Company.point_of_contact" must be a "Employee" instance.
+
+>>> test_gmbh.point_of_contact = test_gmbh.ceo
+>>> test_gmbh.save()
+>>> test_gmbh.name = F('ceo__last_name')
+>>> test_gmbh.save()
+Traceback (most recent call last):
+...
+FieldError: Joined field references are not permitted in this query
+
+# F expressions cannot be used to update attributes on objects which do not yet
+# exist in the database
+>>> acme = Company(name='The Acme Widget Co.', num_employees=12, num_chairs=5,
+...     ceo=test_gmbh.ceo)
+>>> acme.num_employees = F('num_employees') + 16
+>>> acme.save()
+Traceback (most recent call last):
+...
+TypeError: int() argument must be a string or a number, not 'ExpressionNode'
+
 """}
diff --git a/tests/regressiontests/fixtures_regress/models.py b/tests/regressiontests/fixtures_regress/models.py
index 16a9fc4fc5..e33471646c 100644
--- a/tests/regressiontests/fixtures_regress/models.py
+++ b/tests/regressiontests/fixtures_regress/models.py
@@ -54,7 +54,7 @@ class Parent(models.Model):
 class Child(Parent):
     data = models.CharField(max_length=10)
 
-# Models to regresison check #7572
+# Models to regression test #7572
 class Channel(models.Model):
     name = models.CharField(max_length=255)
 
@@ -65,6 +65,14 @@ class Article(models.Model):
     class Meta:
         ordering = ('id',)
 
+# Models to regression test #11428
+class Widget(models.Model):
+    name = models.CharField(max_length=255)
+
+class WidgetProxy(Widget):
+    class Meta:
+        proxy = True
+
 __test__ = {'API_TESTS':"""
 >>> from django.core import management
 
@@ -170,4 +178,18 @@ Weight = 1.2 (<type 'float'>)
 >>> management.call_command('dumpdata', 'fixtures_regress.animal', format='json')
 [{"pk": 1, "model": "fixtures_regress.animal", "fields": {"count": 3, "weight": 1.2, "name": "Lion", "latin_name": "Panthera leo"}}, {"pk": 2, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.29..., "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}}, {"pk": 10, "model": "fixtures_regress.animal", "fields": {"count": 42, "weight": 1.2, "name": "Emu", "latin_name": "Dromaius novaehollandiae"}}]
 
+###############################################
+# Regression for #11428 - Proxy models aren't included
+# when you run dumpdata over an entire app
+
+# Flush out the database first
+>>> management.call_command('reset', 'fixtures_regress', interactive=False, verbosity=0)
+
+# Create an instance of the concrete class
+>>> Widget(name='grommet').save()
+
+# Dump data for the entire app. The proxy class shouldn't be included
+>>> management.call_command('dumpdata', 'fixtures_regress', format='json')
+[{"pk": 1, "model": "fixtures_regress.widget", "fields": {"name": "grommet"}}]
+
 """}
diff --git a/tests/regressiontests/mail/tests.py b/tests/regressiontests/mail/tests.py
index f4c416c231..e90d77366f 100644
--- a/tests/regressiontests/mail/tests.py
+++ b/tests/regressiontests/mail/tests.py
@@ -90,8 +90,8 @@ BadHeaderError: Header values can't contain newlines (got u'Subject\nInjection T
 
 # Make sure we can manually set the From header (#9214)
 
->>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'}) 
->>> message = email.message() 
+>>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'})
+>>> message = email.message()
 >>> message['From']
 'from@example.com'
 
@@ -115,8 +115,7 @@ To: to@example.com
 Date: Fri, 09 Nov 2001 01:08:47 -0000
 Message-ID: foo
 ...
-Content-Type: multipart/alternative; boundary="..."
-MIME-Version: 1.0
+Content-Type: multipart/alternative;...
 ...
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
diff --git a/tests/regressiontests/servers/__init__.py b/tests/regressiontests/servers/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regressiontests/servers/models.py b/tests/regressiontests/servers/models.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regressiontests/servers/tests.py b/tests/regressiontests/servers/tests.py
new file mode 100644
index 0000000000..7621439032
--- /dev/null
+++ b/tests/regressiontests/servers/tests.py
@@ -0,0 +1,67 @@
+"""
+Tests for django.core.servers.
+"""
+
+import os
+
+import django
+from django.test import TestCase
+from django.core.handlers.wsgi import WSGIHandler
+from django.core.servers.basehttp import AdminMediaHandler
+
+
+class AdminMediaHandlerTests(TestCase):
+
+    def setUp(self):
+        self.admin_media_file_path = \
+            os.path.join(django.__path__[0], 'contrib', 'admin', 'media')
+        self.handler = AdminMediaHandler(WSGIHandler())
+
+    def test_media_urls(self):
+        """
+        Tests that URLs that look like absolute file paths after the
+        settings.ADMIN_MEDIA_PREFIX don't turn into absolute file paths.
+        """
+        # Cases that should work on all platforms.
+        data = (
+            ('/media/css/base.css', ('css', 'base.css')),
+        )
+        # Cases that should raise an exception.
+        bad_data = ()
+
+        # Add platform-specific cases.
+        if os.sep == '/':
+            data += (
+                # URL, tuple of relative path parts.
+                ('/media/\\css/base.css', ('\\css', 'base.css')),
+            )
+            bad_data += (
+                '/media//css/base.css',
+                '/media////css/base.css',
+                '/media/../css/base.css',
+            )
+        elif os.sep == '\\':
+            bad_data += (
+                '/media/C:\css/base.css',
+                '/media//\\css/base.css',
+                '/media/\\css/base.css',
+                '/media/\\\\css/base.css'
+            )
+        for url, path_tuple in data:
+            try:
+                output = self.handler.file_path(url)
+            except ValueError:
+                self.fail("Got a ValueError exception, but wasn't expecting"
+                          " one. URL was: %s" % url)
+            rel_path = os.path.join(*path_tuple)
+            desired = os.path.normcase(
+                os.path.join(self.admin_media_file_path, rel_path))
+            self.assertEqual(output, desired,
+                "Got: %s, Expected: %s, URL was: %s" % (output, desired, url))
+        for url in bad_data:
+            try:
+                output = self.handler.file_path(url)
+            except ValueError:
+                continue
+            self.fail('URL: %s should have caused a ValueError exception.'
+                      % url)