diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 79151f8fe1..027f55c0f4 100644
Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index b59b339b2e..428b20081c 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-06 18:53+0200\n"
-"PO-Revision-Date: 2010-04-26 13:53+0100\n"
+"POT-Creation-Date: 2010-10-16 21:44+0200\n"
+"PO-Revision-Date: 2010-10-10 00:58+0200\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -267,16 +267,16 @@ msgstr "Vereinfachtes Chinesisch"
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: contrib/admin/actions.py:48
+#: contrib/admin/actions.py:45
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Erfolgreich %(count)d %(items)s gelöscht."
 
-#: contrib/admin/actions.py:55 contrib/admin/options.py:1125
+#: contrib/admin/actions.py:52 contrib/admin/options.py:1131
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: contrib/admin/actions.py:73
+#: contrib/admin/actions.py:70
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Ausgewählte %(verbose_name_plural)s löschen"
@@ -315,19 +315,19 @@ msgstr "Diesen Monat"
 msgid "This year"
 msgstr "Dieses Jahr"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:478
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:541
 msgid "Yes"
 msgstr "Ja"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:478
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:541
 msgid "No"
 msgstr "Nein"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:478
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:541
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: contrib/admin/helpers.py:20
+#: contrib/admin/helpers.py:19
 msgid "Action:"
 msgstr "Aktion:"
 
@@ -359,60 +359,60 @@ msgstr "Logeintrag"
 msgid "log entries"
 msgstr "Logeinträge"
 
-#: contrib/admin/options.py:138 contrib/admin/options.py:153
+#: contrib/admin/options.py:144 contrib/admin/options.py:159
 msgid "None"
 msgstr "-"
 
-#: contrib/admin/options.py:559
+#: contrib/admin/options.py:564
 #, python-format
 msgid "Changed %s."
 msgstr "%s geändert."
 
-#: contrib/admin/options.py:559 contrib/admin/options.py:569
-#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:845
-#: forms/models.py:568
+#: contrib/admin/options.py:564 contrib/admin/options.py:574
+#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:864
+#: forms/models.py:583
 msgid "and"
 msgstr "und"
 
-#: contrib/admin/options.py:564
+#: contrib/admin/options.py:569
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" hinzugefügt."
 
-#: contrib/admin/options.py:568
+#: contrib/admin/options.py:573
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(list)s von %(name)s \"%(object)s\" geändert."
 
-#: contrib/admin/options.py:573
+#: contrib/admin/options.py:578
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" gelöscht."
 
-#: contrib/admin/options.py:577
+#: contrib/admin/options.py:582
 msgid "No fields changed."
 msgstr "Keine Felder geändert."
 
-#: contrib/admin/options.py:643
+#: contrib/admin/options.py:648
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt."
 
-#: contrib/admin/options.py:647 contrib/admin/options.py:680
+#: contrib/admin/options.py:652 contrib/admin/options.py:685
 msgid "You may edit it again below."
 msgstr "Das Element kann jetzt erneut bearbeitet werden."
 
-#: contrib/admin/options.py:657 contrib/admin/options.py:690
+#: contrib/admin/options.py:662 contrib/admin/options.py:695
 #, python-format
 msgid "You may add another %s below."
 msgstr "Es kann ein weiteres Element des Typs %s angelegt werden."
 
-#: contrib/admin/options.py:678
+#: contrib/admin/options.py:683
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert."
 
-#: contrib/admin/options.py:686
+#: contrib/admin/options.py:691
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -420,7 +420,7 @@ msgstr ""
 "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt "
 "geändert werden."
 
-#: contrib/admin/options.py:740 contrib/admin/options.py:997
+#: contrib/admin/options.py:745 contrib/admin/options.py:1002
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -428,61 +428,61 @@ msgstr ""
 "Es müssen Objekte aus der Liste ausgewählt werden, um Aktionen "
 "durchzuführen. Es wurden keine Objekte geändert."
 
-#: contrib/admin/options.py:759
+#: contrib/admin/options.py:764
 msgid "No action selected."
 msgstr "Keine Aktion ausgewählt."
 
-#: contrib/admin/options.py:840
+#: contrib/admin/options.py:845
 #, python-format
 msgid "Add %s"
 msgstr "%s hinzufügen"
 
-#: contrib/admin/options.py:866 contrib/admin/options.py:1105
+#: contrib/admin/options.py:871 contrib/admin/options.py:1111
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 "Das %(name)s-Objekt mit dem Primärschlüssel %(key)r ist nicht vorhanden."
 
-#: contrib/admin/options.py:931
+#: contrib/admin/options.py:936
 #, python-format
 msgid "Change %s"
 msgstr "%s ändern"
 
-#: contrib/admin/options.py:977
+#: contrib/admin/options.py:982
 msgid "Database error"
 msgstr "Datenbankfehler"
 
-#: contrib/admin/options.py:1039
+#: contrib/admin/options.py:1044
 #, 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\" wurde erfolgreich geändert."
 msgstr[1] "%(count)s \"%(name)s\" wurden erfolgreich geändert."
 
-#: contrib/admin/options.py:1066
+#: contrib/admin/options.py:1071
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s ausgewählt"
 msgstr[1] "Alle %(total_count)s ausgewählt"
 
-#: contrib/admin/options.py:1071
+#: contrib/admin/options.py:1076
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 von %(cnt)s ausgewählt"
 
-#: contrib/admin/options.py:1118
+#: contrib/admin/options.py:1124
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht."
 
-#: contrib/admin/options.py:1155
+#: contrib/admin/options.py:1161
 #, python-format
 msgid "Change history: %s"
 msgstr "Änderungsgeschichte: %s"
 
-#: contrib/admin/sites.py:18 contrib/admin/views/decorators.py:14
-#: contrib/auth/forms.py:81
+#: contrib/admin/sites.py:18 contrib/admin/views/decorators.py:12
+#: contrib/auth/forms.py:87
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -490,11 +490,11 @@ msgstr ""
 "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder "
 "berücksichtigen die Groß-/Kleinschreibung."
 
-#: contrib/admin/sites.py:307 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:308 contrib/admin/views/decorators.py:38
 msgid "Please log in again, because your session has expired."
 msgstr "Bitte melden Sie sich erneut an, da Ihre Sitzung abgelaufen ist."
 
-#: contrib/admin/sites.py:314 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:315 contrib/admin/views/decorators.py:45
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -502,29 +502,29 @@ msgstr ""
 "Ihr Browser scheint keine Cookies zu akzeptieren. Bitte aktivieren Sie diese "
 "und laden Sie die Seite neu."
 
-#: contrib/admin/sites.py:330 contrib/admin/sites.py:336
-#: contrib/admin/views/decorators.py:66
+#: contrib/admin/sites.py:331 contrib/admin/sites.py:337
+#: contrib/admin/views/decorators.py:64
 msgid "Usernames cannot contain the '@' character."
 msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten."
 
-#: contrib/admin/sites.py:333 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:334 contrib/admin/views/decorators.py:60
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 "Die E-Mail-Adresse entspricht nicht Ihrem Benutzernamen. Bitte stattdessen '%"
 "s' versuchen."
 
-#: contrib/admin/sites.py:389
+#: contrib/admin/sites.py:390
 msgid "Site administration"
 msgstr "Website-Verwaltung"
 
-#: contrib/admin/sites.py:403 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:404 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
-#: contrib/admin/views/decorators.py:20
+#: contrib/admin/views/decorators.py:18
 msgid "Log in"
 msgstr "Anmelden"
 
-#: contrib/admin/sites.py:448
+#: contrib/admin/sites.py:449
 #, python-format
 msgid "%s administration"
 msgstr "%s-Verwaltung"
@@ -537,19 +537,11 @@ msgstr "Datum:"
 msgid "Time:"
 msgstr "Zeit:"
 
-#: contrib/admin/widgets.py:99
-msgid "Currently:"
-msgstr "Derzeit:"
-
-#: contrib/admin/widgets.py:99
-msgid "Change:"
-msgstr "Ändern:"
-
-#: contrib/admin/widgets.py:129
+#: contrib/admin/widgets.py:121
 msgid "Lookup"
 msgstr "Suchen"
 
-#: contrib/admin/widgets.py:244
+#: contrib/admin/widgets.py:240
 msgid "Add Another"
 msgstr "Neu hinzufügen"
 
@@ -764,7 +756,7 @@ msgstr " Nach %(filter_title)s "
 msgid "Models available in the %(name)s application."
 msgstr "Modelle, die in der Anwendung %(name)s vorhanden sind."
 
-#: contrib/admin/templates/admin/index.html:35
+#: contrib/admin/templates/admin/index.html:35 forms/widgets.py:294
 msgid "Change"
 msgstr "Ändern"
 
@@ -826,6 +818,13 @@ msgstr ""
 "Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht "
 "über diese Verwaltungsseiten angelegt."
 
+#: contrib/admin/templates/admin/pagination.html:9
+#, python-format
+msgid "%(count)s %(verbose_name)s"
+msgid_plural "%(count)s %(verbose_name_plural)s"
+msgstr[0] "%(count)s %(verbose_name_plural)s"
+msgstr[1] "%(count)s %(verbose_name_plural)s"
+
 #: contrib/admin/templates/admin/pagination.html:10
 msgid "Show all"
 msgstr "Zeige alle"
@@ -883,13 +882,13 @@ msgstr ""
 "strong> ein."
 
 #: contrib/admin/templates/admin/auth/user/change_password.html:35
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:61 contrib/auth/forms.py:186
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:67 contrib/auth/forms.py:192
 msgid "Password"
 msgstr "Passwort"
 
 #: contrib/admin/templates/admin/auth/user/change_password.html:41
 #: contrib/admin/templates/registration/password_change_form.html:37
-#: contrib/auth/forms.py:187
+#: contrib/auth/forms.py:193
 msgid "Password (again)"
 msgstr "Passwort (wiederholen)"
 
@@ -898,14 +897,14 @@ msgstr "Passwort (wiederholen)"
 msgid "Enter the same password as above, for verification."
 msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben."
 
-#: contrib/admin/templates/admin/edit_inline/stacked.html:64
-#: contrib/admin/templates/admin/edit_inline/tabular.html:110
+#: contrib/admin/templates/admin/edit_inline/stacked.html:67
+#: contrib/admin/templates/admin/edit_inline/tabular.html:113
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "%(verbose_name)s hinzufügen"
 
-#: contrib/admin/templates/admin/edit_inline/stacked.html:67
-#: contrib/admin/templates/admin/edit_inline/tabular.html:113
+#: contrib/admin/templates/admin/edit_inline/stacked.html:70
+#: contrib/admin/templates/admin/edit_inline/tabular.html:116
 #: contrib/comments/templates/comments/delete.html:12
 msgid "Remove"
 msgstr "Entfernen"
@@ -948,12 +947,12 @@ msgstr ""
 "neue Passwort ein."
 
 #: contrib/admin/templates/registration/password_change_form.html:27
-#: contrib/auth/forms.py:170
+#: contrib/auth/forms.py:176
 msgid "Old password"
 msgstr "Altes Passwort"
 
 #: contrib/admin/templates/registration/password_change_form.html:32
-#: contrib/auth/forms.py:144
+#: contrib/auth/forms.py:150
 msgid "New password"
 msgstr "Neues Passwort"
 
@@ -1072,85 +1071,77 @@ msgstr "E-Mail-Adresse:"
 msgid "Reset my password"
 msgstr "Mein Passwort zurücksetzen"
 
-#: contrib/admin/templatetags/admin_list.py:257
+#: contrib/admin/templatetags/admin_list.py:263
 msgid "All dates"
 msgstr "Alle Daten"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr "%s auswählen"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s to change"
 msgstr "%s zur Änderung auswählen"
 
-#: contrib/admin/views/template.py:38 contrib/sites/models.py:38
-msgid "site"
-msgstr "Site"
-
-#: contrib/admin/views/template.py:40
-msgid "template"
-msgstr "Template"
-
-#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
-#: contrib/admindocs/views.py:65
+#: contrib/admindocs/views.py:63 contrib/admindocs/views.py:65
+#: contrib/admindocs/views.py:67
 msgid "tag:"
 msgstr "Schlagwort:"
 
-#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
-#: contrib/admindocs/views.py:98
+#: contrib/admindocs/views.py:98 contrib/admindocs/views.py:100
+#: contrib/admindocs/views.py:102
 msgid "filter:"
 msgstr "Filter:"
 
-#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
-#: contrib/admindocs/views.py:162
+#: contrib/admindocs/views.py:162 contrib/admindocs/views.py:164
+#: contrib/admindocs/views.py:166
 msgid "view:"
 msgstr "Ansicht:"
 
-#: contrib/admindocs/views.py:190
+#: contrib/admindocs/views.py:194
 #, python-format
 msgid "App %r not found"
 msgstr "Anwendung %r nicht gefunden"
 
-#: contrib/admindocs/views.py:197
+#: contrib/admindocs/views.py:201
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modell %(model_name)r wurde nicht in Anwendung %(app_label)r gefunden"
 
-#: contrib/admindocs/views.py:209
+#: contrib/admindocs/views.py:213
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "Das verknüpfte `%(app_label)s.%(data_type)s` Objekt"
 
-#: 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
+#: contrib/admindocs/views.py:213 contrib/admindocs/views.py:232
+#: contrib/admindocs/views.py:237 contrib/admindocs/views.py:251
+#: contrib/admindocs/views.py:265 contrib/admindocs/views.py:270
 msgid "model:"
 msgstr "Modell:"
 
-#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
+#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:260
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "verknüpftes `%(app_label)s.%(object_name)s` Objekt"
 
-#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
+#: contrib/admindocs/views.py:232 contrib/admindocs/views.py:265
 #, python-format
 msgid "all %s"
 msgstr "Alle %s"
 
-#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
+#: contrib/admindocs/views.py:237 contrib/admindocs/views.py:270
 #, python-format
 msgid "number of %s"
 msgstr "Anzahl von %s"
 
-#: contrib/admindocs/views.py:271
+#: contrib/admindocs/views.py:275
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Felder am %s Objekt"
 
-#: contrib/admindocs/views.py:361
+#: contrib/admindocs/views.py:365
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ist scheinbar kein urlpattern-Objekt"
@@ -1252,7 +1243,7 @@ msgstr "Passwort erfolgreich geändert."
 msgid "Change password: %s"
 msgstr "Passwort ändern: %s"
 
-#: contrib/auth/forms.py:14 contrib/auth/forms.py:48 contrib/auth/forms.py:60
+#: contrib/auth/forms.py:14 contrib/auth/forms.py:48 contrib/auth/forms.py:66
 msgid "Username"
 msgstr "Benutzername"
 
@@ -1274,16 +1265,16 @@ msgstr "Passwort bestätigen"
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzername ist bereits vergeben."
 
-#: contrib/auth/forms.py:37 contrib/auth/forms.py:156
-#: contrib/auth/forms.py:198
+#: contrib/auth/forms.py:37 contrib/auth/forms.py:162
+#: contrib/auth/forms.py:204
 msgid "The two password fields didn't match."
 msgstr "Die beiden Passwörter sind nicht identisch."
 
-#: contrib/auth/forms.py:83
+#: contrib/auth/forms.py:89
 msgid "This account is inactive."
 msgstr "Dieser Benutzer ist inaktiv."
 
-#: contrib/auth/forms.py:88
+#: contrib/auth/forms.py:94
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -1291,11 +1282,11 @@ msgstr ""
 "Der Webbrowser scheint keine Cookies aktiviert zu haben. Cookies sind für "
 "die Anmeldung zwingend erforderlich."
 
-#: contrib/auth/forms.py:101
+#: contrib/auth/forms.py:107
 msgid "E-mail"
 msgstr "E-Mail-Adresse"
 
-#: contrib/auth/forms.py:110
+#: contrib/auth/forms.py:116
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -1303,16 +1294,16 @@ msgstr ""
 "Zu dieser E-Mail-Adresse existiert kein Benutzer. Sicher, dass Sie sich mit "
 "dieser Adresse registriert haben?"
 
-#: contrib/auth/forms.py:136
+#: contrib/auth/forms.py:142
 #, python-format
 msgid "Password reset on %s"
 msgstr "Passwort auf %s zurücksetzen"
 
-#: contrib/auth/forms.py:145
+#: contrib/auth/forms.py:151
 msgid "New password confirmation"
 msgstr "Neues Passwort bestätigen"
 
-#: contrib/auth/forms.py:178
+#: contrib/auth/forms.py:184
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Das alte Passwort war falsch. Bitte neu eingeben."
 
@@ -1336,38 +1327,38 @@ msgstr "Berechtigungen"
 msgid "group"
 msgstr "Gruppe"
 
-#: contrib/auth/models.py:99 contrib/auth/models.py:206
+#: contrib/auth/models.py:99 contrib/auth/models.py:202
 msgid "groups"
 msgstr "Gruppen"
 
-#: contrib/auth/models.py:196
+#: contrib/auth/models.py:192
 msgid "username"
 msgstr "Benutzername"
 
-#: contrib/auth/models.py:196
+#: contrib/auth/models.py:192
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Erforderlich. 30 Zeichen oder weniger. Nur alphanumerische Zeichen "
 "(Buchstaben, Ziffern und @/./+/-/_) sind erlaubt."
 
-#: contrib/auth/models.py:197
+#: contrib/auth/models.py:193
 msgid "first name"
 msgstr "Vorname"
 
-#: contrib/auth/models.py:198
+#: contrib/auth/models.py:194
 msgid "last name"
 msgstr "Nachname"
 
-#: contrib/auth/models.py:199
+#: contrib/auth/models.py:195
 msgid "e-mail address"
 msgstr "E-Mail-Adresse"
 
-#: contrib/auth/models.py:200
+#: contrib/auth/models.py:196
 msgid "password"
 msgstr "Passwort"
 
-#: contrib/auth/models.py:200
+#: contrib/auth/models.py:196
 msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
@@ -1375,20 +1366,20 @@ msgstr ""
 "Die Form '[algo]$[salt]$[hexdigest]' verwenden, oder das <a href=\"password/"
 "\">Passwort ändern Formular</a> benutzen."
 
-#: contrib/auth/models.py:201
+#: contrib/auth/models.py:197
 msgid "staff status"
 msgstr "Redakteur-Status"
 
-#: contrib/auth/models.py:201
+#: contrib/auth/models.py:197
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann."
 
-#: contrib/auth/models.py:202
+#: contrib/auth/models.py:198
 msgid "active"
 msgstr "Aktiv"
 
-#: contrib/auth/models.py:202
+#: contrib/auth/models.py:198
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -1396,11 +1387,11 @@ msgstr ""
 "Legt fest, ob dieser Benutzer aktiv ist. Kann deaktiviert werden, anstatt "
 "Benutzer zu löschen."
 
-#: contrib/auth/models.py:203
+#: contrib/auth/models.py:199
 msgid "superuser status"
 msgstr "Administrator-Status"
 
-#: contrib/auth/models.py:203
+#: contrib/auth/models.py:199
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -1408,15 +1399,15 @@ msgstr ""
 "Legt fest, dass der Benutzer alle Berechtigungen hat, ohne diese einzeln "
 "zuweisen zu müssen."
 
-#: contrib/auth/models.py:204
+#: contrib/auth/models.py:200
 msgid "last login"
 msgstr "Letzte Anmeldung"
 
-#: contrib/auth/models.py:205
+#: contrib/auth/models.py:201
 msgid "date joined"
 msgstr "Mitglied seit"
 
-#: contrib/auth/models.py:207
+#: contrib/auth/models.py:203
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
@@ -1424,20 +1415,20 @@ msgstr ""
 "Zusätzlich zu den manuell angelegten Rechten erhält dieser Benutzer auch "
 "alle Rechte, die seine zugewiesenen Gruppen haben."
 
-#: contrib/auth/models.py:208
+#: contrib/auth/models.py:204
 msgid "user permissions"
 msgstr "Berechtigungen"
 
-#: contrib/auth/models.py:212 contrib/comments/models.py:50
+#: contrib/auth/models.py:208 contrib/comments/models.py:50
 #: contrib/comments/models.py:168
 msgid "user"
 msgstr "Benutzer"
 
-#: contrib/auth/models.py:213
+#: contrib/auth/models.py:209
 msgid "users"
 msgstr "Benutzer"
 
-#: contrib/auth/models.py:394
+#: contrib/auth/models.py:397
 msgid "message"
 msgstr "Mitteilung"
 
@@ -1446,7 +1437,7 @@ msgid "Logged out"
 msgstr "Abgemeldet"
 
 #: contrib/auth/management/commands/createsuperuser.py:24
-#: core/validators.py:120 forms/fields.py:427
+#: core/validators.py:120 forms/fields.py:447
 msgid "Enter a valid e-mail address."
 msgstr "Bitte eine gültige E-Mail-Adresse eingeben."
 
@@ -1505,31 +1496,31 @@ msgstr "%(site_name)s-Kommentare"
 msgid "Latest comments on %(site_name)s"
 msgstr "Die neuesten Kommentare auf %(site_name)s"
 
-#: contrib/comments/forms.py:93
+#: contrib/comments/forms.py:109
 msgid "Name"
 msgstr "Name"
 
-#: contrib/comments/forms.py:94
+#: contrib/comments/forms.py:110
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: contrib/comments/forms.py:95 contrib/flatpages/admin.py:8
-#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1109
+#: contrib/comments/forms.py:111 contrib/flatpages/admin.py:8
+#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1120
 msgid "URL"
 msgstr "Adresse (URL)"
 
-#: contrib/comments/forms.py:96
+#: contrib/comments/forms.py:112
 msgid "Comment"
 msgstr "Kommentar"
 
-#: contrib/comments/forms.py:175
+#: contrib/comments/forms.py:191
 #, 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] "Keine Schimpfworte! Das Wort %s ist hier nicht erlaubt!"
 msgstr[1] "Keine Schimpfworte! Die Wörter %s sind hier nicht erlaubt!"
 
-#: contrib/comments/forms.py:182
+#: contrib/comments/forms.py:198
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
@@ -1565,7 +1556,7 @@ msgstr "Kommentar"
 msgid "date/time submitted"
 msgstr "Datum/Zeit Erstellung"
 
-#: contrib/comments/models.py:60 db/models/fields/__init__.py:904
+#: contrib/comments/models.py:60 db/models/fields/__init__.py:915
 msgid "IP address"
 msgstr "IP-Adresse"
 
@@ -1751,11 +1742,11 @@ msgstr ""
 
 #: contrib/flatpages/admin.py:11
 msgid ""
-"This value must contain only letters, numbers, underscores, dashes or "
-"slashes."
+"This value must contain only letters, numbers, dots, underscores, dashes, "
+"slashes or tildes."
 msgstr ""
-"Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Schrägstriche "
-"enthalten."
+"Dieser Wert darf nur Buchstaben, Ziffern, Punkte, Unterstriche und "
+"Bindestriche enthalten."
 
 #: contrib/flatpages/admin.py:22
 msgid "Advanced options"
@@ -1803,7 +1794,7 @@ msgstr "Seite"
 msgid "flat pages"
 msgstr "Seiten"
 
-#: contrib/formtools/wizard.py:140
+#: contrib/formtools/wizard.py:177
 msgid ""
 "We apologize, but your form has expired. Please continue filling out the "
 "form from this page."
@@ -2022,6 +2013,78 @@ msgstr ""
 msgid "Enter a 4 digit post code."
 msgstr "Bitte eine gültige vierstellige Postleitzahl eingeben."
 
+#: contrib/localflavor/be/be_provinces.py:5
+msgid "Antwerp"
+msgstr "Antwerpen"
+
+#: contrib/localflavor/be/be_provinces.py:6
+msgid "Brussels"
+msgstr "Brüssel"
+
+#: contrib/localflavor/be/be_provinces.py:7
+msgid "East Flanders"
+msgstr "Ostflandern"
+
+#: contrib/localflavor/be/be_provinces.py:8
+msgid "Flemish Brabant"
+msgstr "Flämisch-Brabant"
+
+#: contrib/localflavor/be/be_provinces.py:9
+msgid "Hainaut"
+msgstr "Hennegau"
+
+#: contrib/localflavor/be/be_provinces.py:10
+msgid "Liege"
+msgstr "Lüttich"
+
+#: contrib/localflavor/be/be_provinces.py:11
+#: contrib/localflavor/nl/nl_provinces.py:9
+msgid "Limburg"
+msgstr "Limburg"
+
+#: contrib/localflavor/be/be_provinces.py:12
+msgid "Luxembourg"
+msgstr "Luxemburg"
+
+#: contrib/localflavor/be/be_provinces.py:13
+msgid "Namur"
+msgstr "Namür"
+
+#: contrib/localflavor/be/be_provinces.py:14
+msgid "Walloon Brabant"
+msgstr "Wallonisch-Brabant"
+
+#: contrib/localflavor/be/be_provinces.py:15
+msgid "West Flanders"
+msgstr "Westflandern"
+
+#: contrib/localflavor/be/be_regions.py:5
+msgid "Brussels Capital Region"
+msgstr "Region Brüssel-Hauptstadt"
+
+#: contrib/localflavor/be/be_regions.py:6
+msgid "Flemish Region"
+msgstr "Flandern"
+
+#: contrib/localflavor/be/be_regions.py:7
+msgid "Wallonia"
+msgstr "Wallonie"
+
+#: contrib/localflavor/be/forms.py:23
+msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
+msgstr "Bitte eine gültige Postleitzahl im Format 1XXX bis 9XXX eingeben."
+
+#: contrib/localflavor/be/forms.py:46
+msgid ""
+"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
+"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
+"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
+msgstr ""
+"Bitte eine gültige Telefonnummer in einem der folgenden Formate eingeben "
+"0x xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, "
+"04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or "
+"04xxxxxxxx eingeben."
+
 #: contrib/localflavor/br/forms.py:17
 msgid "Enter a zip code in the format XXXXX-XXX."
 msgstr "Bitte eine gültige Postleitzahl im Format XXXXX-XXX eingeben."
@@ -2674,101 +2737,100 @@ msgid "Enter a valid NIK/KTP number"
 msgstr "Bitte eine gültige NIK/KTP-Nummer eingeben."
 
 #: contrib/localflavor/id/id_choices.py:9
+msgid "Aceh"
+msgstr "Aceh"
+
+#: contrib/localflavor/id/id_choices.py:10
 #: contrib/localflavor/id/id_choices.py:73
 msgid "Bali"
 msgstr "Bali"
 
-#: contrib/localflavor/id/id_choices.py:10
+#: contrib/localflavor/id/id_choices.py:11
 #: contrib/localflavor/id/id_choices.py:45
 msgid "Banten"
 msgstr "Banten"
 
-#: contrib/localflavor/id/id_choices.py:11
+#: contrib/localflavor/id/id_choices.py:12
 #: contrib/localflavor/id/id_choices.py:54
 msgid "Bengkulu"
 msgstr "Bengkulu"
 
-#: contrib/localflavor/id/id_choices.py:12
+#: contrib/localflavor/id/id_choices.py:13
 #: contrib/localflavor/id/id_choices.py:47
 msgid "Yogyakarta"
 msgstr "Yogyakarta"
 
-#: contrib/localflavor/id/id_choices.py:13
+#: contrib/localflavor/id/id_choices.py:14
 #: contrib/localflavor/id/id_choices.py:51
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: contrib/localflavor/id/id_choices.py:14
+#: contrib/localflavor/id/id_choices.py:15
 #: contrib/localflavor/id/id_choices.py:75
 msgid "Gorontalo"
 msgstr "Gorontalo"
 
-#: contrib/localflavor/id/id_choices.py:15
+#: contrib/localflavor/id/id_choices.py:16
 #: contrib/localflavor/id/id_choices.py:57
 msgid "Jambi"
 msgstr "Jambi"
 
-#: contrib/localflavor/id/id_choices.py:16
+#: contrib/localflavor/id/id_choices.py:17
 msgid "Jawa Barat"
 msgstr "Jawa Barat"
 
-#: contrib/localflavor/id/id_choices.py:17
+#: contrib/localflavor/id/id_choices.py:18
 msgid "Jawa Tengah"
 msgstr "Jawa Tengah"
 
-#: contrib/localflavor/id/id_choices.py:18
+#: contrib/localflavor/id/id_choices.py:19
 msgid "Jawa Timur"
 msgstr "Jawa Timur"
 
-#: contrib/localflavor/id/id_choices.py:19
+#: contrib/localflavor/id/id_choices.py:20
 #: contrib/localflavor/id/id_choices.py:88
 msgid "Kalimantan Barat"
 msgstr "Kalimantan Barat"
 
-#: contrib/localflavor/id/id_choices.py:20
+#: contrib/localflavor/id/id_choices.py:21
 #: contrib/localflavor/id/id_choices.py:66
 msgid "Kalimantan Selatan"
 msgstr "Kalimantan Selatan"
 
-#: contrib/localflavor/id/id_choices.py:21
+#: contrib/localflavor/id/id_choices.py:22
 #: contrib/localflavor/id/id_choices.py:89
 msgid "Kalimantan Tengah"
 msgstr "Kalimantan Tengah"
 
-#: contrib/localflavor/id/id_choices.py:22
+#: contrib/localflavor/id/id_choices.py:23
 #: contrib/localflavor/id/id_choices.py:90
 msgid "Kalimantan Timur"
 msgstr "Kalimantan Timur"
 
-#: contrib/localflavor/id/id_choices.py:23
+#: contrib/localflavor/id/id_choices.py:24
 msgid "Kepulauan Bangka-Belitung"
 msgstr "Kepulauan Bangka-Belitung"
 
-#: contrib/localflavor/id/id_choices.py:24
+#: contrib/localflavor/id/id_choices.py:25
 #: contrib/localflavor/id/id_choices.py:62
 msgid "Kepulauan Riau"
 msgstr "Kepulauan Riau"
 
-#: contrib/localflavor/id/id_choices.py:25
+#: contrib/localflavor/id/id_choices.py:26
 #: contrib/localflavor/id/id_choices.py:55
 msgid "Lampung"
 msgstr "Lampung"
 
-#: contrib/localflavor/id/id_choices.py:26
+#: contrib/localflavor/id/id_choices.py:27
 #: contrib/localflavor/id/id_choices.py:70
 msgid "Maluku"
 msgstr "Maluku"
 
-#: contrib/localflavor/id/id_choices.py:27
+#: contrib/localflavor/id/id_choices.py:28
 #: contrib/localflavor/id/id_choices.py:71
 msgid "Maluku Utara"
 msgstr "Maluku Utara"
 
-#: contrib/localflavor/id/id_choices.py:28
-#: contrib/localflavor/id/id_choices.py:59
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
 #: contrib/localflavor/id/id_choices.py:29
 msgid "Nusa Tenggara Barat"
 msgstr "Nusa Tenggara Barat"
@@ -2849,6 +2911,10 @@ msgstr "Kediri"
 msgid "Tapanuli"
 msgstr "Tapanuli"
 
+#: contrib/localflavor/id/id_choices.py:59
+msgid "Nanggroe Aceh Darussalam"
+msgstr "Nanggroe Aceh Darussalam"
+
 #: contrib/localflavor/id/id_choices.py:61
 msgid "Kepulauan Bangka Belitung"
 msgstr "Kepulauan Bangka Belitung"
@@ -3085,6 +3151,14 @@ msgstr "Wexford"
 msgid "Wicklow"
 msgstr "Wicklow"
 
+#: contrib/localflavor/il/forms.py:30
+msgid "Enter a postal code in the format XXXXX"
+msgstr "Bitte eine gültige Postleitzahl im Format XXXXX eingeben."
+
+#: contrib/localflavor/il/forms.py:49
+msgid "Enter a valid ID number."
+msgstr "Bitte eine gültige Ausweisnummer eingeben."
+
 #: contrib/localflavor/in_/forms.py:15
 msgid "Enter a zip code in the format XXXXXXX."
 msgstr "Bitte eine gültige Postleitzahl im Format XXXXXXX eingeben."
@@ -3465,10 +3539,6 @@ msgstr "Gelderland"
 msgid "Groningen"
 msgstr "Groningen"
 
-#: contrib/localflavor/nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
 #: contrib/localflavor/nl/nl_provinces.py:10
 msgid "Noord-Brabant"
 msgstr "Nordbrabant"
@@ -4445,7 +4515,7 @@ msgstr "Nordwest"
 msgid "Western Cape"
 msgstr "Westkap"
 
-#: contrib/messages/tests/base.py:101
+#: contrib/messages/tests/base.py:107
 msgid "lazy message"
 msgstr "Lazy Nachricht"
 
@@ -4501,42 +4571,46 @@ msgstr "Sitzung"
 msgid "sessions"
 msgstr "Sitzungen"
 
-#: contrib/sites/models.py:32
+#: contrib/sites/models.py:37
 msgid "domain name"
 msgstr "Domainname"
 
-#: contrib/sites/models.py:33
+#: contrib/sites/models.py:38
 msgid "display name"
 msgstr "Anzeigename"
 
-#: contrib/sites/models.py:39
+#: contrib/sites/models.py:43
+msgid "site"
+msgstr "Site"
+
+#: contrib/sites/models.py:44
 msgid "sites"
 msgstr "Sites"
 
-#: core/validators.py:20 forms/fields.py:66
+#: core/validators.py:20 forms/fields.py:67
 msgid "Enter a valid value."
 msgstr "Bitte einen gültigen Wert eingeben."
 
-#: core/validators.py:87 forms/fields.py:528
+#: core/validators.py:87 forms/fields.py:572
 msgid "Enter a valid URL."
 msgstr "Bitte eine gültige Adresse eingeben."
 
-#: core/validators.py:89 forms/fields.py:529
+#: core/validators.py:89 forms/fields.py:573
 msgid "This URL appears to be a broken link."
 msgstr "Diese Adresse scheint nicht gültig zu sein."
 
-#: core/validators.py:123 forms/fields.py:877
+#: core/validators.py:123 forms/fields.py:921
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Bitte ein gültiges Kürzel, bestehend aus Buchstaben, Ziffern, Unterstrichen "
 "und Bindestrichen, eingeben."
 
-#: core/validators.py:126 forms/fields.py:870
+#: core/validators.py:126 forms/fields.py:914
 msgid "Enter a valid IPv4 address."
 msgstr "Bitte eine gültige IPv4-Adresse eingeben."
 
-#: core/validators.py:129 db/models/fields/__init__.py:572
+#: core/validators.py:129 db/models/fields/__init__.py:575
 msgid "Enter only digits separated by commas."
 msgstr "Bitte nur durch Komma getrennte Ziffern eingeben."
 
@@ -4547,12 +4621,12 @@ msgstr ""
 "Bitte sicherstellen, dass der Wert %(limit_value)s ist. (Er ist %(show_value)"
 "s)"
 
-#: core/validators.py:153 forms/fields.py:204 forms/fields.py:256
+#: core/validators.py:153 forms/fields.py:222 forms/fields.py:274
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr "Dieser Wert muss kleiner oder gleich %(limit_value)s sein."
 
-#: core/validators.py:158 forms/fields.py:205 forms/fields.py:257
+#: core/validators.py:158 forms/fields.py:223 forms/fields.py:275
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr "Dieser Wert muss größer oder gleich %(limit_value)s sein."
@@ -4575,12 +4649,12 @@ msgstr ""
 "Bitte sicherstellen, dass der Wert maximal %(limit_value)d Zeichen hat. (Er "
 "hat %(show_value)d)."
 
-#: db/models/base.py:823
+#: db/models/base.py:842
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s muss für %(date_field)s %(lookup)s eindeutig sein."
 
-#: db/models/base.py:838 db/models/base.py:846
+#: db/models/base.py:857 db/models/base.py:865
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s mit diesem %(field_label)s existiert bereits."
@@ -4603,134 +4677,134 @@ msgstr "Dieses Feld darf nicht leer sein."
 msgid "Field of type: %(field_type)s"
 msgstr "Feldtyp: %(field_type)s"
 
-#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:860
-#: db/models/fields/__init__.py:969 db/models/fields/__init__.py:980
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
+#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
+#: db/models/fields/__init__.py:1018
 msgid "Integer"
 msgstr "Ganzzahl"
 
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:858
+#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
 msgid "This value must be an integer."
 msgstr "Dieser Wert muss eine Ganzzahl sein."
 
-#: db/models/fields/__init__.py:490
+#: db/models/fields/__init__.py:493
 msgid "This value must be either True or False."
 msgstr "Dieser Wert muss True oder False sein."
 
-#: db/models/fields/__init__.py:492
+#: db/models/fields/__init__.py:495
 msgid "Boolean (Either True or False)"
 msgstr "Boolescher Wert (True oder False)"
 
-#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:990
+#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)"
 
-#: db/models/fields/__init__.py:567
+#: db/models/fields/__init__.py:570
 msgid "Comma-separated integers"
 msgstr "Kommaseparierte Liste von Ganzzahlen"
 
-#: db/models/fields/__init__.py:581
+#: db/models/fields/__init__.py:584
 msgid "Date (without time)"
 msgstr "Datum (ohne Uhrzeit)"
 
-#: db/models/fields/__init__.py:585
+#: db/models/fields/__init__.py:588
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Bitte ein gültiges Datum im Format JJJJ-MM-TT eingeben."
 
-#: db/models/fields/__init__.py:586
+#: db/models/fields/__init__.py:589
 #, python-format
 msgid "Invalid date: %s"
 msgstr "Ungültiges Datum: %s"
 
-#: db/models/fields/__init__.py:667
+#: db/models/fields/__init__.py:670
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
 msgstr ""
 "Bitte eine gültige Datums- und Zeitangabe im Format JJJJ-MM-TT SS:MM[ss[."
 "uuuuuu]] eingeben."
 
-#: db/models/fields/__init__.py:669
+#: db/models/fields/__init__.py:672
 msgid "Date (with time)"
 msgstr "Datum (mit Uhrzeit)"
 
-#: db/models/fields/__init__.py:735
+#: db/models/fields/__init__.py:746
 msgid "This value must be a decimal number."
 msgstr "Dieser Wert muss eine Dezimalzahl sein."
 
-#: db/models/fields/__init__.py:737
+#: db/models/fields/__init__.py:748
 msgid "Decimal number"
 msgstr "Dezimalzahl"
 
-#: db/models/fields/__init__.py:792
+#: db/models/fields/__init__.py:803
 msgid "E-mail address"
 msgstr "E-Mail-Adresse"
 
-#: db/models/fields/__init__.py:807 db/models/fields/files.py:220
-#: db/models/fields/files.py:331
+#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
+#: db/models/fields/files.py:339
 msgid "File path"
 msgstr "Dateipfad"
 
-#: db/models/fields/__init__.py:830
+#: db/models/fields/__init__.py:841
 msgid "This value must be a float."
 msgstr "Dieser Wert muss eine Gleitkommazahl sein."
 
-#: db/models/fields/__init__.py:832
+#: db/models/fields/__init__.py:843
 msgid "Floating point number"
 msgstr "Gleitkommazahl"
 
-#: db/models/fields/__init__.py:891
+#: db/models/fields/__init__.py:902
 msgid "Big (8 byte) integer"
 msgstr "Große Ganzzahl (8 Byte)"
 
-#: db/models/fields/__init__.py:920
+#: db/models/fields/__init__.py:931
 msgid "This value must be either None, True or False."
 msgstr "Dieser Wert muss None, True oder False sein."
 
-#: db/models/fields/__init__.py:922
+#: db/models/fields/__init__.py:933
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolescher Wert (True, False oder None)"
 
-#: db/models/fields/__init__.py:1013
+#: db/models/fields/__init__.py:1024
 msgid "Text"
 msgstr "Text"
 
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1040
 msgid "Time"
 msgstr "Zeit"
 
-#: db/models/fields/__init__.py:1033
+#: db/models/fields/__init__.py:1044
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "Bitte eine gültige Zeit im Format HH:MM[:ss[.uuuuuu]] eingeben."
 
-#: db/models/fields/__init__.py:1125
+#: db/models/fields/__init__.py:1136
 msgid "XML text"
 msgstr "XML-Text"
 
-#: db/models/fields/related.py:799
+#: db/models/fields/related.py:801
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Modell %(model)s mit dem Primärschlüssel %(pk)r ist nicht vorhanden."
 
-#: db/models/fields/related.py:801
+#: db/models/fields/related.py:803
 msgid "Foreign Key (type determined by related field)"
 msgstr "Fremdschlüssel (Typ definiert durch verknüpftes Feld)"
 
-#: db/models/fields/related.py:919
+#: db/models/fields/related.py:921
 msgid "One-to-one relationship"
 msgstr "One-to-one-Beziehung"
 
-#: db/models/fields/related.py:981
+#: db/models/fields/related.py:983
 msgid "Many-to-many relationship"
 msgstr "Many-to-many-Beziehung"
 
-#: db/models/fields/related.py:1001
+#: db/models/fields/related.py:1003
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Halten Sie die Strg-Taste (⌘ für Mac) während des Klickens gedrückt, um "
 "mehrere Einträge auszuwählen."
 
-#: db/models/fields/related.py:1062
+#: db/models/fields/related.py:1064
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -4740,59 +4814,59 @@ msgstr[0] ""
 msgstr[1] ""
 "Bitte gültige IDs für %(self)s eingeben. Die Werte %(value)r sind ungültig."
 
-#: forms/fields.py:65
+#: forms/fields.py:66
 msgid "This field is required."
 msgstr "Dieses Feld ist zwingend erforderlich."
 
-#: forms/fields.py:203
+#: forms/fields.py:221
 msgid "Enter a whole number."
 msgstr "Bitte eine ganze Zahl eingeben."
 
-#: forms/fields.py:234 forms/fields.py:255
+#: forms/fields.py:252 forms/fields.py:273
 msgid "Enter a number."
 msgstr "Bitte eine Zahl eingeben."
 
-#: forms/fields.py:258
+#: forms/fields.py:276
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Bitte geben Sie nicht mehr als insgesamt %s Ziffern ein."
 
-#: forms/fields.py:259
+#: forms/fields.py:277
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Bitte geben Sie nicht mehr als %s Dezimalstellen ein."
 
-#: forms/fields.py:260
+#: forms/fields.py:278
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Bitte geben Sie nicht mehr als %s Ziffern vor dem Komma ein."
 
-#: forms/fields.py:322 forms/fields.py:837
+#: forms/fields.py:340 forms/fields.py:881
 msgid "Enter a valid date."
 msgstr "Bitte ein gültiges Datum eingeben."
 
-#: forms/fields.py:350 forms/fields.py:838
+#: forms/fields.py:368 forms/fields.py:882
 msgid "Enter a valid time."
 msgstr "Bitte eine gültige Uhrzeit eingeben."
 
-#: forms/fields.py:376
+#: forms/fields.py:394
 msgid "Enter a valid date/time."
 msgstr "Bitte ein gültiges Datum und Uhrzeit eingeben."
 
-#: forms/fields.py:434
+#: forms/fields.py:458
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Es wurde keine Datei übermittelt. Überprüfen Sie das Encoding des Formulars."
 
-#: forms/fields.py:435
+#: forms/fields.py:459
 msgid "No file was submitted."
 msgstr "Es wurde keine Datei übertragen."
 
-#: forms/fields.py:436
+#: forms/fields.py:460
 msgid "The submitted file is empty."
 msgstr "Die ausgewählte Datei ist leer."
 
-#: forms/fields.py:437
+#: forms/fields.py:461
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -4800,7 +4874,13 @@ msgstr ""
 "Bitte sicherstellen, dass der Dateiname maximal %(max)d Zeichen hat. (Er hat "
 "%(length)d)."
 
-#: forms/fields.py:472
+#: forms/fields.py:462
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+"Bitte wählen Sie entweder eine Datei aus oder wählen Sie \"Löschen\", nicht "
+"beides."
+
+#: forms/fields.py:516
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -4808,13 +4888,13 @@ msgstr ""
 "Bitte ein Bild hochladen. Die hochgeladene Datei ist kein Bild oder ist "
 "defekt."
 
-#: forms/fields.py:595 forms/fields.py:670
+#: forms/fields.py:639 forms/fields.py:714
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 "Bitte eine gültige Auswahl treffen. %(value)s ist keine gültige Auswahl."
 
-#: forms/fields.py:671 forms/fields.py:733 forms/models.py:1002
+#: forms/fields.py:715 forms/fields.py:777 forms/models.py:1020
 msgid "Enter a list of values."
 msgstr "Bitte eine Liste mit Werten eingeben."
 
@@ -4822,18 +4902,18 @@ msgstr "Bitte eine Liste mit Werten eingeben."
 msgid "Order"
 msgstr "Reihenfolge"
 
-#: forms/models.py:562
+#: forms/models.py:577
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Bitte die doppelten Daten für %(field)s korrigieren."
 
-#: forms/models.py:566
+#: forms/models.py:581
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Bitte die doppelten Daten für %(field)s korrigieren, das eindeutig sein muss."
 
-#: forms/models.py:572
+#: forms/models.py:587
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -4842,56 +4922,74 @@ msgstr ""
 "Bitte die doppelten Daten für %(field_name)s korrigieren, da es für %(lookup)"
 "s in %(date_field)s eindeutig sein muss."
 
-#: forms/models.py:580
+#: forms/models.py:595
 msgid "Please correct the duplicate values below."
 msgstr "Bitte die unten aufgeführten doppelten Werte korrigieren."
 
-#: forms/models.py:855
+#: forms/models.py:870
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Der Inline-Fremdschlüssel passt nicht zum Primärschlüssel der übergeordneten "
 "Instanz."
 
-#: forms/models.py:921
+#: forms/models.py:931
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Bitte eine gültige Auswahl treffen. Dies ist keine gültige Auswahl."
 
-#: forms/models.py:1003
+#: forms/models.py:1021
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Bitte eine gültige Auswahl treffen. %s ist keine gültige Auswahl."
 
-#: forms/models.py:1005
+#: forms/models.py:1023
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" ist kein gültiger Wert für einen Primärschlüssel."
 
-#: template/defaultfilters.py:776
+#: forms/widgets.py:293
+msgid "Currently"
+msgstr "Derzeit"
+
+#: forms/widgets.py:295
+msgid "Clear"
+msgstr "Zurücksetzen"
+
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "Ja,Nein,Vielleicht"
 
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:825
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d Byte"
 msgstr[1] "%(size)d Bytes"
 
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:827
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:829
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:831
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
+#: template/defaultfilters.py:833
+#, python-format
+msgid "%.1f TB"
+msgstr "%.1f TB"
+
+#: template/defaultfilters.py:834
+#, python-format
+msgid "%.1f PB"
+msgstr "%.1f PB"
+
 #: utils/dateformat.py:42
 msgid "p.m."
 msgstr "nachm."
@@ -5096,7 +5194,7 @@ msgstr "Nov."
 msgid "Dec."
 msgstr "Dez."
 
-#: utils/text.py:130
+#: utils/text.py:136
 msgid "or"
 msgstr "oder"
 
@@ -5150,23 +5248,23 @@ msgstr "%(number)d %(type)s"
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: utils/translation/trans_real.py:519
+#: utils/translation/trans_real.py:523
 msgid "DATE_FORMAT"
 msgstr "j. N Y"
 
-#: utils/translation/trans_real.py:520
+#: utils/translation/trans_real.py:524
 msgid "DATETIME_FORMAT"
 msgstr "j. N Y, H:i"
 
-#: utils/translation/trans_real.py:521
+#: utils/translation/trans_real.py:525
 msgid "TIME_FORMAT"
 msgstr "H:i"
 
-#: utils/translation/trans_real.py:542
+#: utils/translation/trans_real.py:546
 msgid "YEAR_MONTH_FORMAT"
 msgstr "F Y"
 
-#: utils/translation/trans_real.py:543
+#: utils/translation/trans_real.py:547
 msgid "MONTH_DAY_FORMAT"
 msgstr "j. F"
 
@@ -5184,42 +5282,3 @@ msgstr "%(verbose_name)s wurde erfolgreich aktualisiert."
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s wurde gelöscht."
-
-#~ msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-#~ msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s"
-
-#~ msgid "One or more %(fieldname)s in %(name)s:"
-#~ msgstr "Ein oder mehrere %(fieldname)s in %(name)s:"
-
-#~ msgid "Old password:"
-#~ msgstr "Altes Passwort:"
-
-#~ msgid "Relation to parent model"
-#~ msgstr "Beziehung zum Eltern-Modell"
-
-#~ msgid "Add user"
-#~ msgstr "Benutzer hinzufügen"
-
-#~ msgid "Comment moderation queue"
-#~ msgstr "Kommentar-Moderation"
-
-#~ msgid "No comments to moderate"
-#~ msgstr "Es sind keine Kommentare zu moderieren"
-
-#~ msgid "Email"
-#~ msgstr "E-Mail-Adresse"
-
-#~ msgid "Authenticated?"
-#~ msgstr "Authentifiziert?"
-
-#~ msgid "IP Address"
-#~ msgstr "IP-Adresse"
-
-#~ msgid "Date posted"
-#~ msgstr "Verfassungsdatum"
-
-#~ msgid "yes"
-#~ msgstr "ja"
-
-#~ msgid "no"
-#~ msgstr "nein"