From aa239e3e5405933af6a29dac3cf587b59a099927 Mon Sep 17 00:00:00 2001
From: Justin Bronn
Date: Tue, 5 Aug 2008 17:15:33 +0000
Subject: gis: Merged revisions
7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214
via svnmerge from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
AUTHORS | 13 +-
django/__init__.py | 2 +-
django/conf/global_settings.py | 6 +
django/conf/locale/de/LC_MESSAGES/django.mo | Bin 52607 -> 55380 bytes
django/conf/locale/de/LC_MESSAGES/django.po | 1243 +++--
django/conf/locale/es/LC_MESSAGES/django.mo | Bin 63019 -> 68193 bytes
django/conf/locale/es/LC_MESSAGES/django.po | 1850 ++++---
django/conf/locale/es_AR/LC_MESSAGES/django.mo | Bin 67118 -> 67678 bytes
django/conf/locale/es_AR/LC_MESSAGES/django.po | 1372 +++---
django/conf/locale/fr/LC_MESSAGES/django.mo | Bin 67158 -> 67164 bytes
django/conf/locale/fr/LC_MESSAGES/django.po | 70 +-
django/conf/locale/it/LC_MESSAGES/django.mo | Bin 66524 -> 69007 bytes
django/conf/locale/it/LC_MESSAGES/django.po | 1179 +++--
django/conf/locale/ka/LC_MESSAGES/django.mo | Bin 67194 -> 67386 bytes
django/conf/locale/ka/LC_MESSAGES/django.po | 346 +-
django/conf/locale/nl/LC_MESSAGES/django.mo | Bin 42340 -> 66957 bytes
django/conf/locale/nl/LC_MESSAGES/django.po | 2702 +++++-----
django/conf/locale/no/LC_MESSAGES/django.mo | Bin 40780 -> 41683 bytes
django/conf/locale/no/LC_MESSAGES/django.po | 3470 ++++++-------
django/conf/locale/pl/LC_MESSAGES/django.mo | Bin 66481 -> 67643 bytes
django/conf/locale/pl/LC_MESSAGES/django.po | 1098 +++--
django/conf/locale/pt_BR/LC_MESSAGES/django.mo | Bin 52903 -> 52903 bytes
django/conf/locale/pt_BR/LC_MESSAGES/django.po | 2 +-
django/conf/locale/sr/LC_MESSAGES/django.mo | Bin 32213 -> 42073 bytes
django/conf/locale/sr/LC_MESSAGES/django.po | 5178 +++++++++++++++-----
django/conf/locale/sr/LC_MESSAGES/djangojs.mo | Bin 1669 -> 1810 bytes
django/conf/locale/sr/LC_MESSAGES/djangojs.po | 59 +-
django/conf/locale/sv/LC_MESSAGES/django.mo | Bin 57325 -> 57615 bytes
django/conf/locale/sv/LC_MESSAGES/django.po | 1280 ++---
django/conf/project_template/urls.py | 13 +-
django/contrib/admin/__init__.py | 7 +-
django/contrib/admin/media/css/rtl.css | 3 +
django/contrib/admin/options.py | 99 +-
django/contrib/admin/sites.py | 68 +-
.../admin/templates/admin/includes/fieldset.html | 4 +-
.../admin/templates/admin_doc/model_detail.html | 2 +-
.../registration/password_reset_complete.html | 16 +
.../registration/password_reset_confirm.html | 32 +
.../registration/password_reset_done.html | 2 +-
.../registration/password_reset_email.html | 14 +-
.../registration/password_reset_form.html | 2 +-
django/contrib/admin/validation.py | 11 +-
django/contrib/admin/views/decorators.py | 8 +-
django/contrib/admin/views/main.py | 1 -
django/contrib/admin/widgets.py | 3 +-
django/contrib/admindocs/views.py | 2 +-
django/contrib/auth/admin.py | 2 +-
django/contrib/auth/decorators.py | 4 +-
django/contrib/auth/forms.py | 103 +-
.../auth/management/commands/createsuperuser.py | 2 +-
django/contrib/auth/models.py | 3 +
django/contrib/auth/tests/__init__.py | 5 +-
django/contrib/auth/tests/basic.py | 21 -
django/contrib/auth/tests/forms.py | 33 +-
django/contrib/auth/tests/tokens.py | 29 +
django/contrib/auth/tests/views.py | 88 +
django/contrib/auth/tokens.py | 66 +
django/contrib/auth/urls.py | 11 +-
django/contrib/auth/views.py | 64 +-
django/contrib/comments/models.py | 4 +-
django/contrib/contenttypes/generic.py | 5 +-
django/contrib/csrf/middleware.py | 53 +-
django/contrib/databrowse/plugins/calendars.py | 1 -
django/contrib/databrowse/plugins/fieldchoices.py | 1 -
django/contrib/databrowse/sites.py | 2 +-
django/contrib/databrowse/views.py | 2 -
django/contrib/formtools/preview.py | 7 +-
django/contrib/formtools/tests.py | 1 -
django/contrib/formtools/wizard.py | 7 +-
django/contrib/gis/db/backend/oracle/field.py | 2 +-
django/contrib/gis/db/backend/postgis/field.py | 2 +-
django/contrib/gis/db/models/manager.py | 5 +
django/contrib/localflavor/at/__init__.py | 0
django/contrib/localflavor/at/at_states.py | 14 +
django/contrib/localflavor/at/forms.py | 65 +
django/contrib/localflavor/ro/__init__.py | 0
django/contrib/localflavor/ro/forms.py | 200 +
django/contrib/localflavor/ro/ro_counties.py | 52 +
django/contrib/redirects/admin.py | 11 +
django/contrib/redirects/models.py | 15 -
django/contrib/sessions/backends/base.py | 10 +-
django/contrib/sessions/backends/cache.py | 2 -
django/contrib/sessions/backends/db.py | 3 -
django/contrib/sessions/middleware.py | 5 -
django/contrib/sessions/models.py | 6 +-
django/contrib/sitemaps/__init__.py | 16 +-
django/contrib/sitemaps/management/__init__.py | 0
.../sitemaps/management/commands/__init__.py | 0
django/contrib/sitemaps/views.py | 24 +-
django/contrib/sites/tests.py | 5 +-
django/contrib/syndication/feeds.py | 2 +-
django/core/cache/__init__.py | 23 +-
django/core/cache/backends/base.py | 9 +-
django/core/cache/backends/filebased.py | 29 +-
django/core/cache/backends/locmem.py | 2 +-
django/core/files/temp.py | 58 +
django/core/files/uploadedfile.py | 3 +-
django/core/files/uploadhandler.py | 3 +-
django/core/handlers/base.py | 41 +-
django/core/handlers/modpython.py | 25 +-
django/core/handlers/wsgi.py | 19 +-
django/core/mail.py | 7 +-
django/core/management/commands/compilemessages.py | 3 +-
django/core/management/commands/test.py | 1 -
django/core/management/commands/testserver.py | 1 -
django/core/management/sql.py | 12 +-
django/core/management/validation.py | 45 +-
django/core/paginator.py | 98 +-
django/core/serializers/base.py | 6 +-
django/core/serializers/json.py | 9 +-
django/core/serializers/pyyaml.py | 8 +-
django/core/urlresolvers.py | 33 +-
django/db/backends/__init__.py | 70 +-
django/db/backends/mysql/base.py | 19 +-
django/db/backends/oracle/base.py | 30 +-
django/db/backends/oracle/query.py | 9 +-
django/db/backends/sqlite3/base.py | 8 +-
django/db/backends/util.py | 12 +-
django/db/models/__init__.py | 2 -
django/db/models/base.py | 38 +-
django/db/models/fields/__init__.py | 244 +-
django/db/models/fields/related.py | 173 +-
django/db/models/fields/subclassing.py | 5 +-
django/db/models/query.py | 35 +-
django/db/models/sql/query.py | 34 +-
django/db/models/sql/where.py | 39 +-
django/dispatch/dispatcher.py | 32 +-
django/dispatch/saferef.py | 1 -
django/forms/fields.py | 16 +-
django/forms/formsets.py | 18 +-
django/forms/models.py | 30 +-
django/forms/util.py | 1 -
django/http/__init__.py | 13 +-
django/http/multipartparser.py | 15 +-
django/middleware/common.py | 6 +-
django/oldforms/__init__.py | 4 -
django/template/context.py | 2 +
django/template/defaulttags.py | 35 +-
django/test/client.py | 2 +-
django/test/testcases.py | 144 +-
django/utils/cache.py | 6 +-
django/utils/dateformat.py | 2 +-
django/utils/encoding.py | 2 -
django/utils/functional.py | 60 +-
django/utils/hashcompat.py | 16 +
django/utils/html.py | 6 +-
django/utils/http.py | 29 +
django/utils/maxlength.py | 65 -
django/utils/simplejson/LICENSE.txt | 1 -
django/utils/simplejson/__init__.py | 186 +-
django/utils/simplejson/decoder.py | 104 +-
django/utils/simplejson/encoder.py | 86 +-
django/utils/simplejson/jsonfilter.py | 40 -
django/utils/simplejson/scanner.py | 18 +-
django/utils/simplejson/tool.py | 44 +
django/utils/thread_support.py | 12 +
django/utils/translation/trans_real.py | 13 +-
django/views/debug.py | 2 -
django/views/generic/create_update.py | 8 +-
django/views/generic/simple.py | 1 -
docs/add_ons.txt | 5 +-
docs/admin.txt | 221 +-
docs/api_stability.txt | 5 +-
docs/authentication.txt | 10 +-
docs/cache.txt | 38 +-
docs/contenttypes.txt | 8 +-
docs/contributing.txt | 1 -
docs/csrf.txt | 12 +-
docs/custom_model_fields.txt | 59 +-
docs/databases.txt | 4 +-
docs/db-api.txt | 36 +-
docs/django-admin.txt | 2 +-
docs/email.txt | 2 +-
docs/faq.txt | 17 +-
docs/fastcgi.txt | 36 +-
docs/form_for_model.txt | 14 +-
docs/form_preview.txt | 4 +-
docs/form_wizard.txt | 16 +-
docs/forms.txt | 2976 ++++++++---
docs/generic_views.txt | 1275 ++---
docs/i18n.txt | 35 +-
docs/index.txt | 2 +-
docs/install.txt | 4 +-
docs/localflavor.txt | 78 +-
docs/middleware.txt | 2 +-
docs/model-api.txt | 166 +-
docs/modelforms.txt | 26 +-
docs/modpython.txt | 20 +
docs/newforms.txt | 2522 ----------
docs/oldforms.txt | 696 +++
docs/overview.txt | 6 +-
docs/pagination.txt | 121 +-
docs/release_notes_0.95.txt | 4 +-
docs/release_notes_1.0_alpha.txt | 163 +
docs/request_response.txt | 12 -
docs/serialization.txt | 24 +-
docs/sessions.txt | 8 +-
docs/settings.txt | 16 +-
docs/sitemaps.txt | 4 +
docs/templates.txt | 29 +-
docs/testing.txt | 15 +-
docs/tutorial02.txt | 30 +-
docs/tutorial03.txt | 4 +-
docs/upload_handling.txt | 12 +-
docs/url_dispatch.txt | 4 +-
setup.py | 20 +
tests/modeltests/choices/models.py | 11 +
tests/modeltests/custom_methods/models.py | 3 +-
tests/modeltests/delete/models.py | 31 +-
tests/modeltests/generic_relations/models.py | 55 +
tests/modeltests/invalid_models/models.py | 65 +
tests/modeltests/m2m_through/__init__.py | 2 +
tests/modeltests/m2m_through/models.py | 337 ++
tests/modeltests/many_to_one/models.py | 8 +-
tests/modeltests/model_forms/models.py | 6 +-
tests/modeltests/model_formsets/models.py | 56 +-
tests/modeltests/pagination/models.py | 107 +-
tests/modeltests/validation/models.py | 22 +-
.../regressiontests/admin_registration/__init__.py | 0
tests/regressiontests/admin_registration/models.py | 64 +
tests/regressiontests/admin_scripts/tests.py | 181 +-
tests/regressiontests/admin_views/tests.py | 8 +-
tests/regressiontests/auth_backends/tests.py | 8 +-
tests/regressiontests/cache/tests.py | 33 +-
.../regressiontests/context_processors/__init__.py | 0
tests/regressiontests/context_processors/models.py | 1 +
.../context_processors/request_attrs.html | 13 +
tests/regressiontests/context_processors/tests.py | 38 +
tests/regressiontests/context_processors/urls.py | 8 +
tests/regressiontests/context_processors/views.py | 8 +
.../dispatch/tests/test_dispatcher.py | 18 +-
tests/regressiontests/file_uploads/models.py | 11 +-
tests/regressiontests/file_uploads/tests.py | 76 +-
tests/regressiontests/forms/fields.py | 106 +-
tests/regressiontests/forms/forms.py | 4 +
tests/regressiontests/forms/formsets.py | 16 +-
tests/regressiontests/forms/localflavor/at.py | 80 +
tests/regressiontests/forms/localflavor/ro.py | 175 +
tests/regressiontests/forms/models.py | 19 +
tests/regressiontests/forms/tests.py | 4 +
.../m2m_through_regress/__init__.py | 2 +
.../regressiontests/m2m_through_regress/models.py | 204 +
tests/regressiontests/mail/tests.py | 9 +-
.../regressiontests/many_to_one_regress/models.py | 52 +-
tests/regressiontests/max_lengths/tests.py | 2 +-
tests/regressiontests/maxlength/__init__.py | 0
tests/regressiontests/maxlength/models.py | 0
tests/regressiontests/maxlength/tests.py | 160 -
tests/regressiontests/model_fields/models.py | 60 +-
tests/regressiontests/model_fields/tests.py | 38 +-
.../model_inheritance_regress/models.py | 35 +
tests/regressiontests/model_regress/models.py | 19 +
tests/regressiontests/modeladmin/models.py | 14 +
tests/regressiontests/null_fk/models.py | 18 +-
tests/regressiontests/one_to_one_regress/models.py | 35 +-
.../regressiontests/pagination_regress/__init__.py | 0
tests/regressiontests/pagination_regress/models.py | 1 +
tests/regressiontests/pagination_regress/tests.py | 157 +
tests/regressiontests/queries/models.py | 69 +-
tests/regressiontests/requests/tests.py | 5 +-
.../reverse_single_related/__init__.py | 0
.../reverse_single_related/models.py | 54 +
tests/regressiontests/serializers_regress/tests.py | 36 +-
tests/regressiontests/templates/loaders.py | 5 +-
tests/regressiontests/templates/tests.py | 25 +-
.../regressiontests/test_client_regress/models.py | 12 +-
tests/regressiontests/test_utils/__init__.py | 0
tests/regressiontests/test_utils/models.py | 0
tests/regressiontests/test_utils/tests.py | 72 +
tests/regressiontests/utils/datastructures.py | 6 -
tests/regressiontests/utils/tests.py | 7 +
271 files changed, 20937 insertions(+), 13781 deletions(-)
create mode 100644 django/contrib/admin/templates/registration/password_reset_complete.html
create mode 100644 django/contrib/admin/templates/registration/password_reset_confirm.html
create mode 100644 django/contrib/auth/tests/tokens.py
create mode 100644 django/contrib/auth/tests/views.py
create mode 100644 django/contrib/auth/tokens.py
create mode 100644 django/contrib/localflavor/at/__init__.py
create mode 100644 django/contrib/localflavor/at/at_states.py
create mode 100644 django/contrib/localflavor/at/forms.py
create mode 100644 django/contrib/localflavor/ro/__init__.py
create mode 100644 django/contrib/localflavor/ro/forms.py
create mode 100644 django/contrib/localflavor/ro/ro_counties.py
create mode 100644 django/contrib/redirects/admin.py
create mode 100644 django/contrib/sitemaps/management/__init__.py
create mode 100644 django/contrib/sitemaps/management/commands/__init__.py
create mode 100644 django/core/files/temp.py
create mode 100644 django/utils/hashcompat.py
delete mode 100644 django/utils/maxlength.py
delete mode 100644 django/utils/simplejson/jsonfilter.py
create mode 100644 django/utils/simplejson/tool.py
create mode 100644 django/utils/thread_support.py
delete mode 100644 docs/newforms.txt
create mode 100644 docs/oldforms.txt
create mode 100644 docs/release_notes_1.0_alpha.txt
create mode 100644 tests/modeltests/m2m_through/__init__.py
create mode 100644 tests/modeltests/m2m_through/models.py
create mode 100644 tests/regressiontests/admin_registration/__init__.py
create mode 100644 tests/regressiontests/admin_registration/models.py
create mode 100644 tests/regressiontests/context_processors/__init__.py
create mode 100644 tests/regressiontests/context_processors/models.py
create mode 100644 tests/regressiontests/context_processors/templates/context_processors/request_attrs.html
create mode 100644 tests/regressiontests/context_processors/tests.py
create mode 100644 tests/regressiontests/context_processors/urls.py
create mode 100644 tests/regressiontests/context_processors/views.py
create mode 100644 tests/regressiontests/forms/localflavor/at.py
create mode 100644 tests/regressiontests/forms/localflavor/ro.py
create mode 100644 tests/regressiontests/m2m_through_regress/__init__.py
create mode 100644 tests/regressiontests/m2m_through_regress/models.py
delete mode 100644 tests/regressiontests/maxlength/__init__.py
delete mode 100644 tests/regressiontests/maxlength/models.py
delete mode 100644 tests/regressiontests/maxlength/tests.py
create mode 100644 tests/regressiontests/pagination_regress/__init__.py
create mode 100644 tests/regressiontests/pagination_regress/models.py
create mode 100644 tests/regressiontests/pagination_regress/tests.py
create mode 100644 tests/regressiontests/reverse_single_related/__init__.py
create mode 100644 tests/regressiontests/reverse_single_related/models.py
create mode 100644 tests/regressiontests/test_utils/__init__.py
create mode 100644 tests/regressiontests/test_utils/models.py
create mode 100644 tests/regressiontests/test_utils/tests.py
diff --git a/AUTHORS b/AUTHORS
index 24e3e5bcac..a9f55836e6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,6 +41,7 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
people who have submitted patches, reported bugs, added translations, helped
answer newbie questions, and generally made Django that much better:
+ ajs
alang@bright-green.com
Marty Alchin
atlithorn
@@ -70,7 +71,7 @@ answer newbie questions, and generally made Django that much better:
Esdras Beleza
Chris Bennett
James Bennett
- Ben Godfrey
+ Julian Bez
Arvis Bickovskis
Paul Bissex
Simon Blanchard
@@ -150,8 +151,10 @@ answer newbie questions, and generally made Django that much better:
Stefane Fermgier
Afonso Fernández Nogueira
J. Pablo Fernandez
+ Maciej Fijalkowski
Matthew Flanagan
Eric Floehr
+ Eric Florenzano
Vincent Foley
Rudolph Froger
Jorge Gajon
@@ -164,6 +167,7 @@ answer newbie questions, and generally made Django that much better:
glin@seznam.cz
martin.glueck@gmail.com
Artyom Gnilov
+ Ben Godfrey
GomoX
Guilherme Mesquita Gondim
Mario Gonzalez
@@ -172,6 +176,7 @@ answer newbie questions, and generally made Django that much better:
Owen Griffiths
Espen Grindhaug
Thomas Güttler
+ Horst Gutmann
dAniel hAhler
hambaloney
Brian Harring
@@ -234,6 +239,7 @@ answer newbie questions, and generally made Django that much better:
Stuart Langridge
Paul Lanier
Nicola Larosa
+ Lau Bech Lauritzen
Rune Rønde Laursen
Eugene Lazutkin
lcordier@point45.com
@@ -276,6 +282,7 @@ answer newbie questions, and generally made Django that much better:
Eric Moritz
mrmachine
Robin Munn
+ James Murty
msundstr
Robert Myers
Nebojša Dorđević
@@ -301,6 +308,7 @@ answer newbie questions, and generally made Django that much better:
phil@produxion.net
phil.h.smith@gmail.com
Gustavo Picon
+ Michael Placentra II
Luke Plant
plisk
Mihai Preda
@@ -338,8 +346,10 @@ answer newbie questions, and generally made Django that much better:
Pete Shinners
Leo Shklovskii
jason.sidabras@gmail.com
+ Brenton Simpson
Jozko Skrablin
Ben Slavin
+ sloonz
SmileyChris
smurf@smurf.noris.de
Vsevolod Solovyov
@@ -398,6 +408,7 @@ answer newbie questions, and generally made Django that much better:
charly.wilhelm@gmail.com
Rachel Willmer
Gary Wilson
+ Jakub Wilk
Jakub Wiśniowski
Maciej Wiśniowski
wojtek
diff --git a/django/__init__.py b/django/__init__.py
index de473fa4e9..e5f3d5df9b 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (0, 97, 'pre')
+VERSION = (1, 0, 'alpha')
def get_version():
"Returns the version as a human-format string."
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 2c9720da10..811feed349 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -188,6 +188,9 @@ APPEND_SLASH = True
# Whether to prepend the "www." subdomain to URLs that don't have it.
PREPEND_WWW = False
+# Override the server-derived value of SCRIPT_NAME
+FORCE_SCRIPT_NAME = None
+
# List of compiled regular expression objects representing User-Agent strings
# that are not allowed to visit any page, systemwide. Use this for bad
# robots/crawlers. Here are a few examples:
@@ -363,6 +366,9 @@ LOGOUT_URL = '/accounts/logout/'
LOGIN_REDIRECT_URL = '/accounts/profile/'
+# The number of days a password reset link is valid for
+PASSWORD_RESET_TIMEOUT_DAYS = 3
+
###########
# TESTING #
###########
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 234819f879..638bf5e76a 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 f529167baa..897634f4d2 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: 2008-06-23 20:23+0200\n"
-"PO-Revision-Date: 2008-06-23 20:51+0100\n"
+"POT-Creation-Date: 2008-08-01 11:38+0200\n"
+"PO-Revision-Date: 2008-08-01 12:42+0100\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -252,51 +252,208 @@ msgid "This year"
msgstr "Dieses Jahr"
#: contrib/admin/filterspecs.py:147
-#: newforms/widgets.py:231
+#: forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Yes"
msgstr "Ja"
#: contrib/admin/filterspecs.py:147
-#: newforms/widgets.py:231
+#: forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "No"
msgstr "Nein"
#: contrib/admin/filterspecs.py:154
-#: newforms/widgets.py:231
+#: forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Unknown"
msgstr "Unbekannt"
-#: contrib/admin/models.py:18
+#: contrib/admin/models.py:19
msgid "action time"
msgstr "Zeitpunkt der Aktion"
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
msgid "object id"
msgstr "Objekt-ID"
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
msgid "object repr"
msgstr "Objekt Darst."
-#: contrib/admin/models.py:23
+#: contrib/admin/models.py:24
msgid "action flag"
msgstr "Aktionskennzeichen"
-#: contrib/admin/models.py:24
+#: contrib/admin/models.py:25
msgid "change message"
msgstr "Änderungsmeldung"
-#: contrib/admin/models.py:27
+#: contrib/admin/models.py:28
msgid "log entry"
msgstr "Logeintrag"
-#: contrib/admin/models.py:28
+#: contrib/admin/models.py:29
msgid "log entries"
msgstr "Logeinträge"
+#: contrib/admin/options.py:140
+#: contrib/admin/options.py:178
+msgid "None"
+msgstr "-"
+
+#: contrib/admin/options.py:358
+#: contrib/auth/admin.py:37
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt."
+
+#: contrib/admin/options.py:362
+#: contrib/admin/options.py:430
+#: contrib/auth/admin.py:42
+msgid "You may edit it again below."
+msgstr "Das Element kann jetzt weiter bearbeitet werden."
+
+#: contrib/admin/options.py:372
+#: contrib/admin/options.py:439
+#, python-format
+msgid "You may add another %s below."
+msgstr "Jetzt kann ein weiteres Element des Typs %s angelegt werden."
+
+#: contrib/admin/options.py:406
+#, python-format
+msgid "Changed %s."
+msgstr "%s geändert."
+
+#: contrib/admin/options.py:406
+#: contrib/admin/options.py:416
+#: core/validators.py:279
+#: db/models/manipulators.py:305
+msgid "and"
+msgstr "und"
+
+#: contrib/admin/options.py:411
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "%(name)s \"%(object)s\" hinzugefügt."
+
+#: contrib/admin/options.py:415
+#, 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:420
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "%(name)s \"%(object)s\" gelöscht."
+
+#: contrib/admin/options.py:425
+msgid "No fields changed."
+msgstr "Keine Felder geändert."
+
+#: contrib/admin/options.py:428
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert."
+
+#: contrib/admin/options.py:436
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt geändert werden."
+
+#: contrib/admin/options.py:517
+#, python-format
+msgid "Add %s"
+msgstr "%s hinzufügen"
+
+#: contrib/admin/options.py:579
+#, python-format
+msgid "Change %s"
+msgstr "%s ändern"
+
+#: contrib/admin/options.py:609
+msgid "Database error"
+msgstr "Datenbankfehler"
+
+#: contrib/admin/options.py:658
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht."
+
+#: contrib/admin/options.py:664
+msgid "Are you sure?"
+msgstr "Sind Sie ganz sicher?"
+
+#: contrib/admin/options.py:691
+#, python-format
+msgid "Change history: %s"
+msgstr "Änderungsgeschichte: %s"
+
+#: contrib/admin/sites.py:18
+#: contrib/admin/views/decorators.py:16
+#: contrib/auth/forms.py:72
+#: contrib/comments/views/comments.py:56
+msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
+msgstr "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder berücksichtigen die Groß-/Kleinschreibung."
+
+#: contrib/admin/sites.py:233
+#: contrib/admin/views/decorators.py:68
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgstr "Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst, die Beiträge wurden gesichert."
+
+#: contrib/admin/sites.py:240
+#: contrib/admin/views/decorators.py:75
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
+msgstr "Es sieht danach aus, dass der Browser keine Cookies akzeptiert. Bitte im Browser Cookies aktivieren und diese Seite neu laden."
+
+#: contrib/admin/sites.py:254
+#: contrib/admin/sites.py:260
+#: contrib/admin/views/decorators.py:92
+msgid "Usernames cannot contain the '@' character."
+msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten."
+
+#: contrib/admin/sites.py:257
+#: contrib/admin/views/decorators.py:88
+#, 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:325
+msgid "Site administration"
+msgstr "Seitenverwaltung"
+
+#: contrib/admin/sites.py:347
+#: contrib/admin/templates/admin/login.html:27
+#: contrib/admin/views/decorators.py:30
+msgid "Log in"
+msgstr "Anmelden"
+
+#: contrib/admin/util.py:126
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s"
+
+#: contrib/admin/util.py:131
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Ein oder mehrere %(fieldname)s in %(name)s:"
+
+#: contrib/admin/widgets.py:65
+msgid "Date:"
+msgstr "Datum:"
+
+#: contrib/admin/widgets.py:65
+msgid "Time:"
+msgstr "Zeit:"
+
+#: contrib/admin/widgets.py:89
+msgid "Currently:"
+msgstr "Derzeit:"
+
+#: contrib/admin/widgets.py:89
+msgid "Change:"
+msgstr "Ändern:"
+
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
msgid "Page not found"
@@ -307,17 +464,19 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden."
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:37
-#: contrib/admin/templates/admin/change_form.html:12
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:4
-#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_reset_complete.html:4
+#: contrib/admin/templates/registration/password_reset_confirm.html:4
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
msgid "Home"
@@ -339,22 +498,28 @@ msgstr "Serverfehler (500)"
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 "Ein Fehler ist aufgetreten. Dieser Fehler wurde an die Serververwalter per E-Mail weitergegeben und sollte bald behoben sein. Vielen Dank für Ihr Verständnis."
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:25
msgid "Welcome,"
msgstr "Willkommen,"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:25
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Documentation"
msgstr "Dokumentation"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:45
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:13
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Change password"
msgstr "Passwort ändern"
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/comments/templates/comments/form.html:6
msgid "Log out"
msgstr "Abmelden"
@@ -367,56 +532,53 @@ msgstr "Django-Systemverwaltung"
msgid "Django administration"
msgstr "Django-Verwaltung"
-#: contrib/admin/templates/admin/change_form.html:14
-#: contrib/admin/templates/admin/index.html:28
+#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/index.html:29
msgid "Add"
msgstr "Hinzufügen"
-#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/change_form.html:26
+#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Geschichte"
-#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/change_form.html:27
msgid "View on site"
msgstr "Im Web anzeigen"
-#: contrib/admin/templates/admin/change_form.html:31
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:37
+#: contrib/admin/templates/admin/auth/user/change_password.html:22
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Bitte den aufgeführten Fehler korrigieren."
msgstr[1] "Bitte die aufgeführten Fehler korrigieren."
-#: contrib/admin/templates/admin/change_form.html:49
-msgid "Ordering"
-msgstr "Sortierung"
-
-#: contrib/admin/templates/admin/change_form.html:52
-msgid "Order:"
-msgstr "Reihenfolge:"
-
-#: contrib/admin/templates/admin/change_list.html:11
+#: contrib/admin/templates/admin/change_list.html:16
#, python-format
msgid "Add %(name)s"
msgstr "%(name)s hinzufügen"
-#: contrib/admin/templates/admin/delete_confirmation.html:8
+#: contrib/admin/templates/admin/change_list.html:26
+msgid "Filter"
+msgstr "Filter"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:9
#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
msgid "Delete"
msgstr "Löschen"
-#: contrib/admin/templates/admin/delete_confirmation.html:13
+#: contrib/admin/templates/admin/delete_confirmation.html:15
#, 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 "Die Löschung des %(object_name)s '%(escaped_object)s' hätte die Löschung von abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die folgenden abhängigen Daten zu löschen:"
-#: contrib/admin/templates/admin/delete_confirmation.html:20
+#: contrib/admin/templates/admin/delete_confirmation.html:22
#, python-format
msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
msgstr "Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen wollen? Es werden zusätzlich die folgenden abhängigen Daten mit gelöscht:"
-#: contrib/admin/templates/admin/delete_confirmation.html:25
+#: contrib/admin/templates/admin/delete_confirmation.html:27
msgid "Yes, I'm sure"
msgstr "Ja, ich bin sicher"
@@ -425,77 +587,68 @@ msgstr "Ja, ich bin sicher"
msgid " By %(filter_title)s "
msgstr " Nach %(filter_title)s "
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filter"
-
-#: contrib/admin/templates/admin/index.html:17
+#: contrib/admin/templates/admin/index.html:18
#, python-format
msgid "Models available in the %(name)s application."
msgstr "Modelle, die in der Anwendung %(name)s vorhanden sind."
-#: contrib/admin/templates/admin/index.html:18
+#: contrib/admin/templates/admin/index.html:19
#, python-format
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/index.html:34
+#: contrib/admin/templates/admin/index.html:35
msgid "Change"
msgstr "Ändern"
-#: contrib/admin/templates/admin/index.html:44
+#: contrib/admin/templates/admin/index.html:45
msgid "You don't have permission to edit anything."
msgstr "Sie haben keine Berechtigung, irgendetwas zu ändern."
-#: contrib/admin/templates/admin/index.html:52
+#: contrib/admin/templates/admin/index.html:53
msgid "Recent Actions"
msgstr "Kürzliche Aktionen"
-#: contrib/admin/templates/admin/index.html:53
+#: contrib/admin/templates/admin/index.html:54
msgid "My Actions"
msgstr "Meine Aktionen"
-#: contrib/admin/templates/admin/index.html:57
+#: contrib/admin/templates/admin/index.html:58
msgid "None available"
msgstr "Keine vorhanden"
-#: contrib/admin/templates/admin/invalid_setup.html:8
+#: 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 "Etwas stimmt nicht mit der Datenbankkonfiguration. Bitte sicherstellen, dass die richtigen Datenbanktabellen angelegt wurden und die Datenbank vom verwendeten Datenbankbenutzer auch lesbar ist."
-#: contrib/admin/templates/admin/login.html:17
+#: contrib/admin/templates/admin/login.html:19
#: contrib/comments/templates/comments/form.html:6
#: contrib/comments/templates/comments/form.html:8
msgid "Username:"
msgstr "Benutzername:"
-#: contrib/admin/templates/admin/login.html:20
+#: contrib/admin/templates/admin/login.html:22
#: contrib/comments/templates/comments/form.html:8
msgid "Password:"
msgstr "Passwort:"
-#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:31
-msgid "Log in"
-msgstr "Anmelden"
-
-#: contrib/admin/templates/admin/object_history.html:17
+#: contrib/admin/templates/admin/object_history.html:16
msgid "Date/time"
msgstr "Datum/Zeit"
-#: contrib/admin/templates/admin/object_history.html:18
+#: contrib/admin/templates/admin/object_history.html:17
msgid "User"
msgstr "Benutzer"
-#: contrib/admin/templates/admin/object_history.html:19
+#: contrib/admin/templates/admin/object_history.html:18
msgid "Action"
msgstr "Aktion"
-#: contrib/admin/templates/admin/object_history.html:25
+#: contrib/admin/templates/admin/object_history.html:24
msgid "DATE_WITH_TIME_FULL"
msgstr "j. N Y, H:i"
-#: contrib/admin/templates/admin/object_history.html:35
+#: contrib/admin/templates/admin/object_history.html:32
msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
msgstr "Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht über diese Verwaltungsseiten angelegt."
@@ -539,26 +692,32 @@ msgstr "Sichern"
msgid "First, enter a username and password. Then, you'll be able to edit more user options."
msgstr "Zuerst einen Benutzer und ein Passwort eingeben. Danach können weitere Optionen für den Benutzer geändert werden."
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
+#: contrib/admin/templates/admin/auth/user/add_form.html:13
+#: contrib/auth/forms.py:14
+#: contrib/auth/forms.py:51
msgid "Username"
msgstr "Benutzername"
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: 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:52
+#: contrib/auth/forms.py:176
msgid "Password"
msgstr "Passwort"
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:38
+#: contrib/admin/templates/admin/auth/user/add_form.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/auth/forms.py:177
msgid "Password (again)"
msgstr "Passwort (wiederholen)"
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: 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 "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben."
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:26
#, python-format
msgid "Enter a new password for the user %(username)s."
msgstr "Bitte geben Sie ein neues Passwort für den Benutzer %(username)s ein."
@@ -629,42 +788,47 @@ msgstr "Vielen Dank, dass Sie hier ein paar nette Minuten verbracht haben."
msgid "Log in again"
msgstr "Erneut anmelden"
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_form.html:5
-#: contrib/admin/templates/registration/password_change_form.html:9
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
msgid "Password change"
msgstr "Passwort ändern"
-#: contrib/admin/templates/registration/password_change_done.html:5
-#: contrib/admin/templates/registration/password_change_done.html:9
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
msgid "Password change successful"
msgstr "Passwort erfolgreich geändert"
-#: contrib/admin/templates/registration/password_change_done.html:11
+#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
msgstr "Ihr Passwort wurde geändert."
-#: contrib/admin/templates/registration/password_change_form.html:11
+#: 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 "Bitte geben Sie aus Sicherheitsgründen erst Ihr altes Passwort und darunter dann zweimal (um sicherzustellen, dass Sie es korrekt eingegeben haben) das neue Kennwort ein."
-#: contrib/admin/templates/registration/password_change_form.html:16
+#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
msgstr "Altes Passwort:"
-#: contrib/admin/templates/registration/password_change_form.html:18
+#: contrib/admin/templates/registration/password_change_form.html:19
+#: contrib/admin/templates/registration/password_reset_confirm.html:18
msgid "New password:"
msgstr "Neues Passwort:"
-#: contrib/admin/templates/registration/password_change_form.html:20
+#: contrib/admin/templates/registration/password_change_form.html:21
+#: contrib/admin/templates/registration/password_reset_confirm.html:20
msgid "Confirm password:"
msgstr "Passwort wiederholen:"
-#: contrib/admin/templates/registration/password_change_form.html:22
+#: contrib/admin/templates/registration/password_change_form.html:23
+#: contrib/admin/templates/registration/password_reset_confirm.html:21
msgid "Change my password"
msgstr "Mein Passwort ändern"
+#: contrib/admin/templates/registration/password_reset_complete.html:4
+#: contrib/admin/templates/registration/password_reset_confirm.html:6
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/password_reset_form.html:6
@@ -672,14 +836,43 @@ msgstr "Mein Passwort ändern"
msgid "Password reset"
msgstr "Passwort zurücksetzen"
+#: contrib/admin/templates/registration/password_reset_complete.html:6
+#: contrib/admin/templates/registration/password_reset_complete.html:10
+msgid "Password reset complete"
+msgstr "Passwort zurücksetzen beendet"
+
+#: contrib/admin/templates/registration/password_reset_complete.html:12
+msgid "Your password has been set. You may go ahead and log in now."
+msgstr "Ihr Passwort wurde zurückgesetzt. Sie können sich nun anmelden."
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:4
+msgid "Password reset confirmation"
+msgstr "Zurücksetzen des Passworts bestätigen"
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:12
+msgid "Enter new password"
+msgstr "Neues Passwort eingeben"
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:14
+msgid "Please enter your new password twice so we can verify you typed it in correctly."
+msgstr "Bitte geben Sie Ihr neues Passwort zweimal ein, damit wir überprüfen können, ob es richtig eingetippt wurde."
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:26
+msgid "Password reset unsuccessful"
+msgstr "Passwort wurde nicht erfolgreich zurückgesetzt"
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:28
+msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
+msgstr "Der Link zum Zurücksetzen Ihres Passworts ist ungültig, wahrscheinlich weil er schon einmal benutzt wurde. Bitte setzen Sie Ihr Passwort erneut zurück."
+
#: contrib/admin/templates/registration/password_reset_done.html:6
#: contrib/admin/templates/registration/password_reset_done.html:10
msgid "Password reset successful"
msgstr "Passwort wurde erfolgreich zurückgesetzt"
#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Wir haben ein neues Passwort an die von Ihnen angegebene E-Mail-Adresse geschickt. Sie sollten es in Kürze erhalten."
+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 "Wir haben Ihnen eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passwort an die von Ihnen angegebene E-Mail-Adresse geschickt. Sie sollten sie in Kürze erhalten."
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
@@ -691,30 +884,25 @@ msgid "for your user account at %(site_name)s"
msgstr "für Ihren Benutzer bei %(site_name)s angefordert haben."
#: contrib/admin/templates/registration/password_reset_email.html:5
-#, python-format
-msgid "Your new password is: %(new_password)s"
-msgstr "Ihr neues Passwort lautet: %(new_password)s"
-
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-msgstr "Sie können das Passwort auf folgender Seite ändern:"
+msgid "Please go to the following page and choose a new password:"
+msgstr "Bitte öffnen Sie folgende Seite, um Ihr neues Passwort einzugeben:"
-#: contrib/admin/templates/registration/password_reset_email.html:11
+#: contrib/admin/templates/registration/password_reset_email.html:9
msgid "Your username, in case you've forgotten:"
msgstr "Ihr Benutzername, falls Sie ihn vergessen haben:"
-#: contrib/admin/templates/registration/password_reset_email.html:13
+#: contrib/admin/templates/registration/password_reset_email.html:11
msgid "Thanks for using our site!"
msgstr "Vielen Dank, dass Sie unsere Seiten benutzen!"
-#: contrib/admin/templates/registration/password_reset_email.html:15
+#: contrib/admin/templates/registration/password_reset_email.html:13
#, python-format
msgid "The %(site_name)s team"
msgstr "Das Team von %(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 reset your password and e-mail the new one to you."
-msgstr "Passwort vergessen? Einfach die E-Mail-Adresse eingeben und wir setzen das Passwort zurück und lassen es Ihnen per E-Mail zukommen."
+msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one."
+msgstr "Passwort vergessen? Einfach Ihre E-Mail-Adresse eingeben und wir senden Ihnen Anweisungen zum Zurücksetzen Ihres Passworts."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -724,351 +912,252 @@ msgstr "E-Mail-Adresse:"
msgid "Reset my password"
msgstr "Mein Passwort zurücksetzen"
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Datum:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Zeit:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Derzeit:"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Ändern:"
-
#: contrib/admin/templatetags/admin_list.py:257
msgid "All dates"
msgstr "Alle Tage"
-#: contrib/admin/views/auth.py:20
-#: contrib/admin/views/main.py:267
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt."
-
-#: contrib/admin/views/auth.py:25
-#: contrib/admin/views/main.py:271
-#: contrib/admin/views/main.py:356
-msgid "You may edit it again below."
-msgstr "Das Element kann jetzt weiter bearbeitet werden."
-
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr "Benutzer hinzufügen"
-
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
-msgstr "Passwort erfolgreich geändert."
-
-#: contrib/admin/views/auth.py:65
+#: contrib/admin/views/main.py:65
#, python-format
-msgid "Change password: %s"
-msgstr "Passwort ändern: %s"
-
-#: contrib/admin/views/decorators.py:17
-#: contrib/auth/forms.py:60
-msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
-msgstr "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder berücksichtigen die Groß-/Kleinschreibung."
-
-#: contrib/admin/views/decorators.py:69
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst, die Beiträge wurden gesichert."
-
-#: contrib/admin/views/decorators.py:76
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Es sieht danach aus, dass der Browser keine Cookies akzeptiert. Bitte im Browser Cookies aktivieren und diese Seite neu laden."
+msgid "Select %s"
+msgstr "%s auswählen"
-#: contrib/admin/views/decorators.py:89
+#: contrib/admin/views/main.py:65
#, 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/views/decorators.py:93
-msgid "Usernames cannot contain the '@' character."
-msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten."
+msgid "Select %s to change"
+msgstr "%s zur Änderung auswählen"
-#: contrib/admin/views/doc.py:48
-#: contrib/admin/views/doc.py:50
-#: contrib/admin/views/doc.py:52
+#: contrib/admindocs/views.py:53
+#: contrib/admindocs/views.py:55
+#: contrib/admindocs/views.py:57
msgid "tag:"
msgstr "Schlagwort:"
-#: contrib/admin/views/doc.py:79
-#: contrib/admin/views/doc.py:81
-#: contrib/admin/views/doc.py:83
+#: contrib/admindocs/views.py:87
+#: contrib/admindocs/views.py:89
+#: contrib/admindocs/views.py:91
msgid "filter:"
msgstr "Filter:"
-#: contrib/admin/views/doc.py:137
-#: contrib/admin/views/doc.py:139
-#: contrib/admin/views/doc.py:141
+#: contrib/admindocs/views.py:153
+#: contrib/admindocs/views.py:155
+#: contrib/admindocs/views.py:157
msgid "view:"
msgstr "Ansicht:"
-#: contrib/admin/views/doc.py:166
+#: contrib/admindocs/views.py:187
#, python-format
msgid "App %r not found"
msgstr "Anwendung %r nicht gefunden"
-#: contrib/admin/views/doc.py:173
+#: contrib/admindocs/views.py:194
#, python-format
-msgid "Model %(name)r not found in app %(label)r"
-msgstr "Modell %(name)r wurde nicht in Anwendung %(label)r gefunden"
+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/admin/views/doc.py:185
+#: contrib/admindocs/views.py:206
#, python-format
-msgid "the related `%(label)s.%(type)s` object"
-msgstr "Das verknüpfte `%(label)s.%(type)s` Objekt"
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "Das verknüpfte `%(app_label)s.%(data_type)s` Objekt"
-#: contrib/admin/views/doc.py:185
-#: contrib/admin/views/doc.py:207
-#: contrib/admin/views/doc.py:221
-#: contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:206
+#: contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:242
+#: contrib/admindocs/views.py:247
msgid "model:"
msgstr "Modell:"
-#: contrib/admin/views/doc.py:216
+#: contrib/admindocs/views.py:237
#, python-format
-msgid "related `%(label)s.%(name)s` objects"
-msgstr "verknüpftes `%(label)s.%(name)s` Objekt"
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "verknüpftes `%(app_label)s.%(object_name)s` Objekt"
-#: contrib/admin/views/doc.py:221
+#: contrib/admindocs/views.py:242
#, python-format
msgid "all %s"
msgstr "Alle %s"
-#: contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:247
#, python-format
msgid "number of %s"
msgstr "Anzahl von %s"
-#: contrib/admin/views/doc.py:231
+#: contrib/admindocs/views.py:253
#, python-format
msgid "Fields on %s objects"
msgstr "Felder am %s Objekt"
-#: contrib/admin/views/doc.py:293
-#: contrib/admin/views/doc.py:304
-#: contrib/admin/views/doc.py:306
-#: contrib/admin/views/doc.py:312
-#: contrib/admin/views/doc.py:313
-#: contrib/admin/views/doc.py:315
+#: contrib/admindocs/views.py:317
+#: contrib/admindocs/views.py:328
+#: contrib/admindocs/views.py:330
+#: contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:337
+#: contrib/admindocs/views.py:339
msgid "Integer"
msgstr "Ganzzahl"
-#: contrib/admin/views/doc.py:294
+#: contrib/admindocs/views.py:318
msgid "Boolean (Either True or False)"
msgstr "Boolscher Wert (True oder False)"
-#: contrib/admin/views/doc.py:295
-#: contrib/admin/views/doc.py:314
+#: contrib/admindocs/views.py:319
+#: contrib/admindocs/views.py:338
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)"
-#: contrib/admin/views/doc.py:296
+#: contrib/admindocs/views.py:320
msgid "Comma-separated integers"
msgstr "Kommaseparierte Liste von Ganzzahlen"
-#: contrib/admin/views/doc.py:297
+#: contrib/admindocs/views.py:321
msgid "Date (without time)"
msgstr "Datum (ohne Uhrzeit)"
-#: contrib/admin/views/doc.py:298
+#: contrib/admindocs/views.py:322
msgid "Date (with time)"
msgstr "Datum (mit Uhrzeit)"
-#: contrib/admin/views/doc.py:299
+#: contrib/admindocs/views.py:323
msgid "Decimal number"
msgstr "Dezimalzahl"
-#: contrib/admin/views/doc.py:300
+#: contrib/admindocs/views.py:324
msgid "E-mail address"
msgstr "E-Mail-Adresse"
-#: contrib/admin/views/doc.py:301
-#: contrib/admin/views/doc.py:302
-#: contrib/admin/views/doc.py:305
+#: contrib/admindocs/views.py:325
+#: contrib/admindocs/views.py:326
+#: contrib/admindocs/views.py:329
msgid "File path"
msgstr "Dateipfad"
-#: contrib/admin/views/doc.py:303
+#: contrib/admindocs/views.py:327
msgid "Floating point number"
msgstr "Fließkommazahl"
-#: contrib/admin/views/doc.py:307
+#: contrib/admindocs/views.py:331
#: contrib/comments/models.py:89
msgid "IP address"
msgstr "IP-Adresse"
-#: contrib/admin/views/doc.py:309
+#: contrib/admindocs/views.py:333
msgid "Boolean (Either True, False or None)"
msgstr "Boolscher Wert (True, False oder None)"
-#: contrib/admin/views/doc.py:310
+#: contrib/admindocs/views.py:334
msgid "Relation to parent model"
msgstr "Beziehung zum Eltern-Modell"
-#: contrib/admin/views/doc.py:311
+#: contrib/admindocs/views.py:335
msgid "Phone number"
msgstr "Telefonnummer"
-#: contrib/admin/views/doc.py:316
+#: contrib/admindocs/views.py:340
msgid "Text"
msgstr "Text"
-#: contrib/admin/views/doc.py:317
+#: contrib/admindocs/views.py:341
msgid "Time"
msgstr "Zeit"
-#: contrib/admin/views/doc.py:318
+#: contrib/admindocs/views.py:342
#: contrib/flatpages/models.py:8
msgid "URL"
msgstr "Adresse (URL)"
-#: contrib/admin/views/doc.py:319
+#: contrib/admindocs/views.py:343
msgid "U.S. state (two uppercase letters)"
msgstr "U.S. Bundesstaat (zwei Großbuchstaben)"
-#: contrib/admin/views/doc.py:320
+#: contrib/admindocs/views.py:344
msgid "XML text"
msgstr "XML-Text"
-#: contrib/admin/views/doc.py:346
+#: contrib/admindocs/views.py:370
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s ist scheinbar kein urlpattern Objekt"
-#: contrib/admin/views/main.py:233
-msgid "Site administration"
-msgstr "Website-Verwaltung"
-
-#: contrib/admin/views/main.py:280
-#: contrib/admin/views/main.py:365
-#, python-format
-msgid "You may add another %s below."
-msgstr "Jetzt kann ein weiteres Element vom Typ %s angelegt werden."
-
-#: contrib/admin/views/main.py:298
-#, python-format
-msgid "Add %s"
-msgstr "%s hinzufügen"
-
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Added %s."
-msgstr "%s hinzugefügt."
-
-#: contrib/admin/views/main.py:344
-#: contrib/admin/views/main.py:346
-#: contrib/admin/views/main.py:348
-#: core/validators.py:283
-#: db/models/manipulators.py:309
-msgid "and"
-msgstr "und"
-
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Changed %s."
-msgstr "%s geändert."
-
-#: contrib/admin/views/main.py:348
-#, python-format
-msgid "Deleted %s."
-msgstr "%s gelöscht."
-
-#: contrib/admin/views/main.py:351
-msgid "No fields changed."
-msgstr "Keine Felder geändert."
-
-#: contrib/admin/views/main.py:354
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert."
-
-#: contrib/admin/views/main.py:362
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt geändert werden."
-
-#: contrib/admin/views/main.py:400
-#, python-format
-msgid "Change %s"
-msgstr "%s ändern"
+#: contrib/auth/admin.py:17
+msgid "Personal info"
+msgstr "Persönliche Infos"
-#: contrib/admin/views/main.py:487
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s"
+#: contrib/auth/admin.py:18
+msgid "Permissions"
+msgstr "Berechtigungen"
-#: contrib/admin/views/main.py:492
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Ein oder mehrere %(fieldname)s in %(name)s:"
+#: contrib/auth/admin.py:19
+msgid "Important dates"
+msgstr "Wichtige Daten"
-#: contrib/admin/views/main.py:524
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht."
+#: contrib/auth/admin.py:20
+msgid "Groups"
+msgstr "Gruppen"
-#: contrib/admin/views/main.py:527
-msgid "Are you sure?"
-msgstr "Sind Sie ganz sicher?"
+#: contrib/auth/admin.py:47
+msgid "Add user"
+msgstr "Benutzer hinzufügen"
-#: contrib/admin/views/main.py:549
-#, python-format
-msgid "Change history: %s"
-msgstr "Änderungsgeschichte: %s"
+#: contrib/auth/forms.py:15
+#: contrib/auth/models.py:134
+msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
+msgstr "Erforderlich. 30 Zeichen oder weniger. Alphanumerische Zeichen (Buchstaben, Ziffern und Unterstriche sind erlaubt)."
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s"
-msgstr "%s auswählen"
+#: contrib/auth/forms.py:16
+#: core/validators.py:72
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s to change"
-msgstr "%s zur Änderung auswählen"
+#: contrib/auth/forms.py:18
+msgid "Password confirmation"
+msgstr "Passwort bestätigen"
-#: contrib/admin/views/main.py:765
-msgid "Database error"
-msgstr "Datenbankfehler"
+#: contrib/auth/forms.py:30
+msgid "A user with that username already exists."
+msgstr "Ein Benutzer mit diesem Namen existiert bereits."
-#: contrib/auth/forms.py:17
-#: contrib/auth/forms.py:138
+#: contrib/auth/forms.py:36
+#: contrib/auth/forms.py:146
+#: contrib/auth/forms.py:188
msgid "The two password fields didn't match."
msgstr "Die beiden Passwörter sind nicht identisch."
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "Ein Benutzer mit diesem Namen existiert bereits."
+#: contrib/auth/forms.py:74
+#: contrib/comments/views/comments.py:58
+msgid "This account is inactive."
+msgstr "Dieser Benutzer ist inaktiv."
-#: contrib/auth/forms.py:53
+#: contrib/auth/forms.py:79
+#: contrib/comments/views/comments.py:49
msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
msgstr "Der Webbrowser scheint keine Cookies aktiviert zu haben. Cookies sind für die Anmeldung zwingend erforderlich."
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
-msgstr "Dieser Benutzer ist inaktiv."
+#: contrib/auth/forms.py:92
+msgid "E-mail"
+msgstr "E-Mail-Adresse"
-#: contrib/auth/forms.py:84
+#: contrib/auth/forms.py:101
msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?"
msgstr "Zu dieser E-Mail-Adresse existiert kein Benutzer. Sicher, dass Sie sich mit dieser Adresse angemeldet haben?"
-#: contrib/auth/forms.py:107
+#: contrib/auth/forms.py:126
#, python-format
msgid "Password reset on %s"
msgstr "Passwort auf %s zurücksetzen"
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr "Die beiden neuen Passwörter sind nicht identisch."
+#: contrib/auth/forms.py:134
+msgid "New password"
+msgstr "Neues Passwort"
+
+#: contrib/auth/forms.py:135
+msgid "New password confirmation"
+msgstr "Neues Passwort bestätigen"
-#: contrib/auth/forms.py:124
+#: contrib/auth/forms.py:160
+msgid "Old password"
+msgstr "Altes Passwort"
+
+#: contrib/auth/forms.py:168
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr "Das alte Passwort war falsch. Bitte neu eingeben."
@@ -1095,112 +1184,101 @@ msgid "group"
msgstr "Gruppe"
#: contrib/auth/models.py:98
-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:144
msgid "groups"
msgstr "Gruppen"
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:134
msgid "username"
msgstr "Benutzername"
-#: contrib/auth/models.py:138
-msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
-msgstr "Erforderlich. 30 Zeichen oder weniger. Alphanumerische Zeichen (Buchstaben, Ziffern und Unterstriche sind erlaubt)."
-
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:135
msgid "first name"
msgstr "Vorname"
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:136
msgid "last name"
msgstr "Nachname"
-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:137
msgid "e-mail address"
msgstr "E-Mail-Adresse"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:138
msgid "password"
msgstr "Passwort"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:138
msgid "Use '[algo]$[salt]$[hexdigest]' or use the change password form."
msgstr "Die Form '[algo]$[salt]$[hexdigest]' verwenden, oder das Passwort ändern Formular benutzen."
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:139
msgid "staff status"
-msgstr "Administrator"
+msgstr "Redakteur"
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:139
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:144
+#: contrib/auth/models.py:140
msgid "active"
msgstr "Aktiv"
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:140
msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
msgstr "Legt fest, ob dieser Benutzer aktiv ist. Kann deaktiviert werden, anstatt Benutzer zu löschen."
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:141
msgid "superuser status"
-msgstr "Hauptadmin."
+msgstr "Hauptadmin"
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:141
msgid "Designates that this user has all permissions without explicitly assigning them."
msgstr "Legt fest, dass der Benutzer alle Berechtigungen hat, ohne diese einzeln zuweisen zu müssen."
-#: contrib/auth/models.py:146
+#: contrib/auth/models.py:142
msgid "last login"
msgstr "Letzte Anmeldung"
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:143
msgid "date joined"
msgstr "Mitglied seit"
-#: contrib/auth/models.py:149
+#: contrib/auth/models.py:145
msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
msgstr "Zusätzlich zu den manuell angelegten Rechten erhält dieser Benutzer auch alle Rechte, die seine zugewiesenen Gruppen haben."
-#: contrib/auth/models.py:150
+#: contrib/auth/models.py:146
msgid "user permissions"
msgstr "Berechtigungen"
-#: contrib/auth/models.py:154
+#: contrib/auth/models.py:150
msgid "user"
msgstr "Benutzer"
-#: contrib/auth/models.py:155
+#: contrib/auth/models.py:151
msgid "users"
msgstr "Benutzer"
-#: contrib/auth/models.py:161
-msgid "Personal info"
-msgstr "Persönliche Infos"
-
-#: contrib/auth/models.py:162
-msgid "Permissions"
-msgstr "Berechtigungen"
-
-#: contrib/auth/models.py:163
-msgid "Important dates"
-msgstr "Wichtige Daten"
-
-#: contrib/auth/models.py:164
-msgid "Groups"
-msgstr "Gruppen"
-
-#: contrib/auth/models.py:323
+#: contrib/auth/models.py:306
msgid "message"
msgstr "Mitteilung"
-#: contrib/auth/views.py:48
+#: contrib/auth/views.py:50
msgid "Logged out"
msgstr "Abgemeldet"
+#: contrib/auth/views.py:160
+msgid "Password changed successfully."
+msgstr "Passwort erfolgreich geändert."
+
+#: contrib/auth/views.py:166
+#, python-format
+msgid "Change password: %s"
+msgstr "Passwort ändern: %s"
+
#: contrib/comments/models.py:71
-#: contrib/comments/models.py:176
+#: contrib/comments/models.py:164
msgid "object ID"
msgstr "Objekt-ID"
@@ -1210,7 +1288,7 @@ msgstr "Überschrift"
#: contrib/comments/models.py:73
#: contrib/comments/models.py:95
-#: contrib/comments/models.py:177
+#: contrib/comments/models.py:165
msgid "comment"
msgstr "Kommentar"
@@ -1251,12 +1329,12 @@ msgid "is valid rating"
msgstr "ist eine Bewertung"
#: contrib/comments/models.py:87
-#: contrib/comments/models.py:179
+#: contrib/comments/models.py:167
msgid "date/time submitted"
msgstr "Datum/Zeit Erstellung"
#: contrib/comments/models.py:88
-#: contrib/comments/models.py:180
+#: contrib/comments/models.py:168
msgid "is public"
msgstr "ist öffentlich"
@@ -1272,12 +1350,12 @@ msgstr "Hier einen Haken setzen, wenn der Kommentar unpassend ist. Stattdessen w
msgid "comments"
msgstr "Kommentare"
-#: contrib/comments/models.py:140
-#: contrib/comments/models.py:222
+#: contrib/comments/models.py:128
+#: contrib/comments/models.py:199
msgid "Content object"
msgstr "Inhaltsobjekt"
-#: contrib/comments/models.py:168
+#: contrib/comments/models.py:156
#, python-format
msgid ""
"Posted by %(user)s at %(date)s\n"
@@ -1292,48 +1370,48 @@ msgstr ""
"\n"
"http://%(domain)s%(url)s"
-#: contrib/comments/models.py:178
+#: contrib/comments/models.py:166
msgid "person's name"
msgstr "Autorname"
-#: contrib/comments/models.py:181
+#: contrib/comments/models.py:169
msgid "ip address"
msgstr "IP-Adresse"
-#: contrib/comments/models.py:183
+#: contrib/comments/models.py:171
msgid "approved by staff"
msgstr "Bestätigt vom Betreiber"
-#: contrib/comments/models.py:187
+#: contrib/comments/models.py:175
msgid "free comment"
msgstr "Freier Kommentar"
-#: contrib/comments/models.py:188
+#: contrib/comments/models.py:176
msgid "free comments"
msgstr "Freie Kommentare"
-#: contrib/comments/models.py:250
+#: contrib/comments/models.py:227
msgid "score"
msgstr "Bewertung"
-#: contrib/comments/models.py:251
+#: contrib/comments/models.py:228
msgid "score date"
msgstr "Bewertungsdatum"
-#: contrib/comments/models.py:255
+#: contrib/comments/models.py:232
msgid "karma score"
msgstr "Karma Bewertung"
-#: contrib/comments/models.py:256
+#: contrib/comments/models.py:233
msgid "karma scores"
msgstr "Karma Bewertungen"
-#: contrib/comments/models.py:260
+#: contrib/comments/models.py:237
#, python-format
msgid "%(score)d rating by %(user)s"
msgstr "%(score)d Bewertung von %(user)s"
-#: contrib/comments/models.py:277
+#: contrib/comments/models.py:254
#, python-format
msgid ""
"This comment was flagged by %(user)s:\n"
@@ -1344,36 +1422,36 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/models.py:285
+#: contrib/comments/models.py:262
msgid "flag date"
msgstr "Kennzeichnungsdatum"
-#: contrib/comments/models.py:289
+#: contrib/comments/models.py:266
msgid "user flag"
msgstr "Benutzerkennzeichnung"
-#: contrib/comments/models.py:290
+#: contrib/comments/models.py:267
msgid "user flags"
msgstr "Benutzerkennzeichnungen"
-#: contrib/comments/models.py:294
+#: contrib/comments/models.py:271
#, python-format
msgid "Flag by %r"
msgstr "Gekennzeichnet von %r"
-#: contrib/comments/models.py:300
+#: contrib/comments/models.py:277
msgid "deletion date"
msgstr "Löschdatum"
-#: contrib/comments/models.py:303
+#: contrib/comments/models.py:280
msgid "moderator deletion"
msgstr "Löschung vom Moderator"
-#: contrib/comments/models.py:304
+#: contrib/comments/models.py:281
msgid "moderator deletions"
msgstr "Löschungen vom Moderator"
-#: contrib/comments/models.py:308
+#: contrib/comments/models.py:285
#, python-format
msgid "Moderator deletion by %r"
msgstr "Vom Moderator %r gelöscht"
@@ -1414,11 +1492,11 @@ msgstr "Kommentarvorschau"
msgid "Your name:"
msgstr "Ihr Name:"
-#: contrib/comments/views/comments.py:28
+#: contrib/comments/views/comments.py:76
msgid "This rating is required because you've entered at least one other rating."
msgstr "Diese Abstimmung ist zwingend erforderlich, da Sie an mindestens einer weiteren Abstimmung teilnehmen."
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:160
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
@@ -1437,7 +1515,7 @@ msgstr[1] ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:117
+#: contrib/comments/views/comments.py:165
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -1448,28 +1526,28 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:190
-#: contrib/comments/views/comments.py:283
+#: contrib/comments/views/comments.py:238
+#: contrib/comments/views/comments.py:331
msgid "Only POSTs are allowed"
msgstr "Nur POST ist erlaubt"
-#: contrib/comments/views/comments.py:194
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:242
+#: contrib/comments/views/comments.py:335
msgid "One or more of the required fields wasn't submitted"
msgstr "Eines oder mehrere der erforderlichen Felder fehlen"
-#: contrib/comments/views/comments.py:198
-#: contrib/comments/views/comments.py:289
+#: contrib/comments/views/comments.py:246
+#: contrib/comments/views/comments.py:337
msgid "Somebody tampered with the comment form (security violation)"
msgstr "Jemand hat mit dem Kommentarformular herumgespielt (Sicherheitsverletzung)"
-#: contrib/comments/views/comments.py:208
-#: contrib/comments/views/comments.py:295
+#: contrib/comments/views/comments.py:256
+#: contrib/comments/views/comments.py:343
msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
msgstr "Das Kommentarformular hatte einen falschen 'target' Parameter -- die Objekt-ID ist ungültig."
-#: contrib/comments/views/comments.py:259
-#: contrib/comments/views/comments.py:324
+#: contrib/comments/views/comments.py:307
+#: contrib/comments/views/comments.py:372
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt"
@@ -1497,6 +1575,10 @@ msgstr "Inhaltstyp"
msgid "content types"
msgstr "Inhaltstypen"
+#: contrib/flatpages/admin.py:9
+msgid "Advanced options"
+msgstr "Erweiterte Optionen"
+
#: contrib/flatpages/models.py:9
msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr "Beispiel: '/about/contact/'. Wichtig: Am Anfang und Ende muss ein / stehen."
@@ -1537,10 +1619,6 @@ msgstr "Webseite"
msgid "flat pages"
msgstr "Webseiten"
-#: contrib/flatpages/models.py:27
-msgid "Advanced options"
-msgstr "Erweiterte Optionen"
-
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "."
@@ -1650,6 +1728,52 @@ msgstr "Bitte eine gültige CUIT im Format XX-XXXXXXXX-X oder XXXXXXXXXXXX einge
msgid "Invalid CUIT."
msgstr "Ungültige CUIT."
+#: contrib/localflavor/at/at_states.py:5
+msgid "Burgenland"
+msgstr "Burgenland"
+
+#: contrib/localflavor/at/at_states.py:6
+msgid "Carinthia"
+msgstr "Kärnten"
+
+#: contrib/localflavor/at/at_states.py:7
+msgid "Lower Austria"
+msgstr "Niederösterreich"
+
+#: contrib/localflavor/at/at_states.py:8
+msgid "Upper Austria"
+msgstr "Oberösterreich"
+
+#: contrib/localflavor/at/at_states.py:9
+msgid "Salzburg"
+msgstr "Salzburg"
+
+#: contrib/localflavor/at/at_states.py:10
+msgid "Styria"
+msgstr "Steiermark"
+
+#: contrib/localflavor/at/at_states.py:11
+msgid "Tyrol"
+msgstr "Tirol"
+
+#: contrib/localflavor/at/at_states.py:12
+msgid "Vorarlberg"
+msgstr "Vorarlberg"
+
+#: contrib/localflavor/at/at_states.py:13
+msgid "Vienna"
+msgstr "Wien"
+
+#: contrib/localflavor/at/forms.py:20
+#: contrib/localflavor/ch/forms.py:16
+#: contrib/localflavor/no/forms.py:12
+msgid "Enter a zip code in the format XXXX."
+msgstr "Bitte eine gültige Postleitzahl im Format XXXX eingeben."
+
+#: contrib/localflavor/at/forms.py:48
+msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
+msgstr "Bitte eine gültige österreichische Sozialversicherungsnummer im Format XXXX XXXXXX eingeben."
+
#: contrib/localflavor/au/forms.py:16
msgid "Enter a 4 digit post code."
msgstr "Bitte eine gültige vierstellige Postleitzahl eingeben."
@@ -1692,15 +1816,15 @@ msgstr "Bitte eine gültige kanadische Sozialversicherungsnummer im Format XXX-X
#: contrib/localflavor/ch/ch_states.py:5
msgid "Aargau"
-msgstr ""
+msgstr "Aargau"
#: contrib/localflavor/ch/ch_states.py:6
msgid "Appenzell Innerrhoden"
-msgstr ""
+msgstr "Appenzell Innerrhoden"
#: contrib/localflavor/ch/ch_states.py:7
msgid "Appenzell Ausserrhoden"
-msgstr ""
+msgstr "Appenzell Ausserrhoden"
#: contrib/localflavor/ch/ch_states.py:8
msgid "Basel-Stadt"
@@ -1794,11 +1918,6 @@ msgstr ""
msgid "Zurich"
msgstr "Zürich"
-#: contrib/localflavor/ch/forms.py:16
-#: contrib/localflavor/no/forms.py:12
-msgid "Enter a zip code in the format XXXX."
-msgstr "Bitte eine gültige Postleitzahl im Format XXXX eingeben."
-
#: contrib/localflavor/ch/forms.py:64
msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
msgstr "Bitte eine gültige Schweizer Identifikations- oder Reisepassnummer im FormatX1234567<0 oder 1234567890 eingeben."
@@ -2149,6 +2268,7 @@ msgid "Region of Murcia"
msgstr ""
#: contrib/localflavor/es/es_regions.py:20
+#, fuzzy
msgid "Foral Community of Navarre"
msgstr ""
@@ -2704,6 +2824,26 @@ msgstr ""
msgid "West Pomerania"
msgstr ""
+#: contrib/localflavor/ro/forms.py:19
+msgid "Enter a valid CIF."
+msgstr "Bitte eine gültige CIF eingeben."
+
+#: contrib/localflavor/ro/forms.py:56
+msgid "Enter a valid CNP."
+msgstr "Bitte eine gültige CNP eingeben."
+
+#: contrib/localflavor/ro/forms.py:141
+msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
+msgstr "Bitte eine gültige IBAN im Format ROXX-XXXX-XXXX-XXXX-XXXX-XXXX eingeben."
+
+#: contrib/localflavor/ro/forms.py:171
+msgid "Phone numbers must be in XXXX-XXXXXX format."
+msgstr "Telefonnummern müssen das Format XXXX-XXXXXX haben."
+
+#: contrib/localflavor/ro/forms.py:194
+msgid "Enter a valid postal code in the format XXXXXX"
+msgstr "Bitte eine gültige Postleitzahl im Format XXXXXX eingeben"
+
#: contrib/localflavor/sk/forms.py:30
msgid "Enter a postal code in the format XXXXX or XXX XX."
msgstr "Bitte eine gültige Postleitzahl im Format XXXXX oder XXX XX eingeben."
@@ -3444,18 +3584,14 @@ msgstr "Domainname"
msgid "display name"
msgstr "Anzeigename"
-#: contrib/sites/models.py:37
+#: contrib/sites/models.py:38
msgid "site"
msgstr "Website"
-#: contrib/sites/models.py:38
+#: contrib/sites/models.py:39
msgid "sites"
msgstr "Websites"
-#: core/validators.py:72
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
-
#: core/validators.py:76
msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
msgstr "Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Schrägstriche enthalten."
@@ -3497,7 +3633,7 @@ msgid "This value can't be comprised solely of digits."
msgstr "Dieser Wert darf nicht nur aus Ziffern bestehen."
#: core/validators.py:128
-#: newforms/fields.py:152
+#: forms/fields.py:161
msgid "Enter a whole number."
msgstr "Bitte eine ganze Zahl eingeben."
@@ -3506,65 +3642,59 @@ msgid "Only alphabetical characters are allowed here."
msgstr "Nur alphabetische Zeichen sind hier erlaubt."
#: core/validators.py:147
-msgid "Year must be 1900 or later."
-msgstr "Das Jahr muss 1900 oder später sein."
-
-#: core/validators.py:151
#, python-format
msgid "Invalid date: %s"
msgstr "Ungültiges Datum: %s"
-#: core/validators.py:156
-#: db/models/fields/__init__.py:548
+#: core/validators.py:152
+#: db/models/fields/__init__.py:574
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Bitte ein gültiges Datum im Format JJJJ-MM-TT eingeben."
-#: core/validators.py:161
+#: core/validators.py:157
msgid "Enter a valid time in HH:MM format."
msgstr "Bitte eine gültige Zeit im Format SS:MM eingeben."
-#: core/validators.py:165
-#: db/models/fields/__init__.py:625
+#: core/validators.py:161
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Bitte eine gültige Datums- und Zeitangabe im Format JJJJ-MM-TT SS:MM eingeben."
-#: core/validators.py:170
-#: newforms/fields.py:403
+#: core/validators.py:166
+#: forms/fields.py:412
msgid "Enter a valid e-mail address."
msgstr "Bitte eine gültige E-Mail-Adresse eingeben."
-#: core/validators.py:182
-#: core/validators.py:474
-#: newforms/fields.py:433
-#: oldforms/__init__.py:687
+#: core/validators.py:178
+#: core/validators.py:470
+#: forms/fields.py:430
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Es wurde keine Datei übermittelt. Eventuell ist das Formular-Encoding falsch."
-#: core/validators.py:193
-#: newforms/fields.py:459
+#: core/validators.py:189
+#: forms/fields.py:470
msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
msgstr "Bitte ein Bild hochladen. Die hochgeladene Datei ist kein Bild, oder ist defekt."
-#: core/validators.py:200
+#: core/validators.py:196
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "Die URL %s zeigt nicht auf ein gültiges Bild."
-#: core/validators.py:204
+#: core/validators.py:200
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
msgstr "Telefonnummern müssen das Format XXX-XXX-XXXX haben. \"%s\" ist ungültig."
-#: core/validators.py:212
+#: core/validators.py:208
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "Die URL %s zeigt nicht auf ein gültiges QuickTime-Video."
-#: core/validators.py:216
+#: core/validators.py:212
msgid "A valid URL is required."
msgstr "Eine gültige URL wird hier verlangt."
-#: core/validators.py:230
+#: core/validators.py:226
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
@@ -3573,331 +3703,337 @@ msgstr ""
"Bitte gültiges HTML eingeben. Fehler sind:\n"
"%s"
-#: core/validators.py:237
+#: core/validators.py:233
#, python-format
msgid "Badly formed XML: %s"
msgstr "Ungültiges XML: %s"
-#: core/validators.py:254
+#: core/validators.py:250
#, python-format
msgid "Invalid URL: %s"
msgstr "Ungültige URL: %s"
-#: core/validators.py:259
-#: core/validators.py:261
+#: core/validators.py:255
+#: core/validators.py:257
#, python-format
msgid "The URL %s is a broken link."
msgstr "Die URL %s funktioniert nicht."
-#: core/validators.py:267
+#: core/validators.py:263
msgid "Enter a valid U.S. state abbreviation."
msgstr "Bitte eine gültige Abkürzung für einen US-Staat eingeben."
-#: core/validators.py:281
+#: core/validators.py:277
#, 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 gern gesehen!"
msgstr[1] "Keine Schimpfworte! Die Wörter %s sind hier nicht gern gesehen!"
-#: core/validators.py:288
+#: core/validators.py:284
#, python-format
msgid "This field must match the '%s' field."
msgstr "Dieses Feld muss zum Feld '%s' passen."
-#: core/validators.py:307
+#: core/validators.py:303
msgid "Please enter something for at least one field."
msgstr "Bitte mindestens eines der Felder ausfüllen."
-#: core/validators.py:316
-#: core/validators.py:327
+#: core/validators.py:312
+#: core/validators.py:323
msgid "Please enter both fields or leave them both empty."
msgstr "Bitte entweder beide Felder ausfüllen, oder beide leer lassen."
-#: core/validators.py:335
+#: core/validators.py:331
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "Dieses Feld muss gefüllt sein, wenn Feld %(field)s den Wert %(value)s hat."
-#: core/validators.py:348
+#: core/validators.py:344
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr "Dieses Feld muss gefüllt sein, wenn Feld %(field)s nicht %(value)s ist."
-#: core/validators.py:367
+#: core/validators.py:363
msgid "Duplicate values are not allowed."
msgstr "Doppelte Werte sind hier nicht erlaubt."
-#: core/validators.py:382
+#: core/validators.py:378
#, python-format
msgid "This value must be between %(lower)s and %(upper)s."
msgstr "Dieser Wert muss zwischen %(lower)s und %(upper)s sein."
-#: core/validators.py:384
+#: core/validators.py:380
#, python-format
msgid "This value must be at least %s."
msgstr "Dieser Wert muss mindestens %s sein."
-#: core/validators.py:386
+#: core/validators.py:382
#, python-format
msgid "This value must be no more than %s."
msgstr "Dieser Wert darf maximal %s sein."
-#: core/validators.py:427
+#: core/validators.py:423
#, python-format
msgid "This value must be a power of %s."
msgstr "Dieser Wert muss eine Potenz von %s sein."
-#: core/validators.py:437
+#: core/validators.py:433
msgid "Please enter a valid decimal number."
msgstr "Bitte eine gültige Dezimalzahl eingeben."
-#: core/validators.py:444
+#: core/validators.py:440
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
msgid_plural "Please enter a valid decimal number with at most %s total digits."
msgstr[0] "Bitte eine gültige Dezimalzahl mit maximal %s Ziffer eingeben."
msgstr[1] "Bitte eine gültige Dezimalzahl mit maximal %s Ziffern eingeben."
-#: core/validators.py:447
+#: core/validators.py:443
#, python-format
msgid "Please enter a valid decimal number with a whole part of at most %s digit."
msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
msgstr[0] "Bitte eine gültige Dezimalzahl mit einer Gesamtzahl von maximal %s Ziffer eingeben."
msgstr[1] "Bitte eine gültige Dezimalzahl mit einer Gesamtzahl von maximal %s Ziffern eingeben."
-#: core/validators.py:450
+#: core/validators.py:446
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural "Please enter a valid decimal number with at most %s decimal places."
msgstr[0] "Bitte eine gültige Dezimalzahl mit maximal %s Dezimalstelle eingeben."
msgstr[1] "Bitte eine gültige Dezimalzahl mit maximal %s Dezimalstellen eingeben."
-#: core/validators.py:458
+#: core/validators.py:454
msgid "Please enter a valid floating point number."
msgstr "Bitte eine gültige Dezimalzahl eingeben."
-#: core/validators.py:467
+#: core/validators.py:463
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "Bitte sicherstellen, dass die hochgeladene Datei mindestens %s Bytes groß ist."
-#: core/validators.py:468
+#: core/validators.py:464
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "Bitte sicherstellen, dass die hochgeladene Datei maximal %s Bytes groß ist."
-#: core/validators.py:485
+#: core/validators.py:481
msgid "The format for this field is wrong."
msgstr "Das Format für dieses Feld ist falsch."
-#: core/validators.py:500
+#: core/validators.py:496
msgid "This field is invalid."
msgstr "Dieses Feld ist ungültig."
-#: core/validators.py:536
+#: core/validators.py:532
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "Konnte nichts von %s empfangen."
-#: core/validators.py:539
+#: core/validators.py:535
#, python-format
msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
msgstr "Die URL %(url)s lieferte den falschen Content-Type '%(contenttype)s'."
-#: core/validators.py:572
+#: core/validators.py:568
#, python-format
msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
msgstr "Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schließen. Die Zeile beginnt mit \"%(start)s\"."
-#: core/validators.py:576
+#: core/validators.py:572
#, python-format
msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
msgstr "In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile beginnt mit \"%(start)s\"."
-#: core/validators.py:581
+#: core/validators.py:577
#, python-format
msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
msgstr "Das Attribute %(attr)s in Zeile %(line)s ist ungültig. Die Zeile beginnt mit \"%(start)s\"."
-#: core/validators.py:586
+#: core/validators.py:582
#, python-format
msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
msgstr "<%(tag)s> in Zeile %(line)s ist ungültig. Die Zeile beginnt mit \"%(start)s\"."
-#: core/validators.py:590
+#: core/validators.py:586
#, python-format
msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
msgstr "Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die Zeile beginnt mit \"%(start)s\"."
-#: core/validators.py:595
+#: core/validators.py:591
#, python-format
msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
msgstr "Das Attribut %(attr)s in Zeile %(line)s hat einen ungültigen Wert. Die Zeile beginnt mit \"%(start)s\"."
-#: db/models/manipulators.py:308
+#: db/models/manipulators.py:304
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "Ein '%(object)s' in dieser '%(type)s' existiert bereits für dieses '%(field)s'."
-#: db/models/fields/__init__.py:51
+#: db/models/fields/__init__.py:47
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "Ein '%(optname)s' mit diesem '%(fieldname)s' existiert bereits."
-#: db/models/fields/__init__.py:176
+#: db/models/fields/__init__.py:175
#: db/models/fields/__init__.py:348
-#: db/models/fields/__init__.py:780
-#: db/models/fields/__init__.py:791
-#: newforms/fields.py:46
+#: db/models/fields/__init__.py:797
+#: db/models/fields/__init__.py:808
+#: forms/fields.py:52
#: oldforms/__init__.py:374
msgid "This field is required."
msgstr "Dieses Feld ist zwingend erforderlich."
-#: db/models/fields/__init__.py:448
+#: db/models/fields/__init__.py:462
msgid "This value must be an integer."
msgstr "Dieser Wert muss eine Ganzzahl sein."
-#: db/models/fields/__init__.py:487
+#: db/models/fields/__init__.py:508
msgid "This value must be either True or False."
msgstr "Dieser Wert muss wahr oder falsch sein."
-#: db/models/fields/__init__.py:511
+#: db/models/fields/__init__.py:537
msgid "This field cannot be null."
msgstr "Dieses Feld darf nicht leer sein."
-#: db/models/fields/__init__.py:689
+#: db/models/fields/__init__.py:639
+#: db/models/fields/__init__.py:656
+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:712
msgid "This value must be a decimal number."
-msgstr "Dieser Wert muss eine Ganzzahl sein."
+msgstr "Dieser Wert muss eine Dezimalzahl sein."
-#: db/models/fields/__init__.py:800
+#: db/models/fields/__init__.py:817
msgid "Enter a valid filename."
msgstr "Bitte einen gültigen Dateinamen eingeben."
-#: db/models/fields/__init__.py:981
+#: db/models/fields/__init__.py:1018
msgid "This value must be either None, True or False."
msgstr "Dieser Wert muss None, True oder False sein."
-#: db/models/fields/related.py:94
+#: db/models/fields/__init__.py:1133
+#: db/models/fields/__init__.py:1146
+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/related.py:93
#, python-format
msgid "Please enter a valid %s."
msgstr "Bitte ein gültiges '%s' eingeben."
-#: db/models/fields/related.py:746
-msgid "Separate multiple IDs with commas."
-msgstr "Mehrere IDs können mit Komma getrennt werden."
-
-#: db/models/fields/related.py:748
+#: db/models/fields/related.py:758
msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command\", beim Klicken gedrückt halten."
-#: db/models/fields/related.py:795
+#: db/models/fields/related.py:838
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
msgstr[0] "Bitte gültige IDs für %(self)s eingeben. Der Wert %(value)r ist ungültig."
msgstr[1] "Bitte gültige IDs für %(self)s eingeben. Die Werte %(value)r sind ungültig."
-#: newforms/fields.py:47
+#: forms/fields.py:53
msgid "Enter a valid value."
msgstr "Bitte einen gültigen Wert eingeben."
-#: newforms/fields.py:124
+#: forms/fields.py:133
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr "Bitte sicherstellen, dass der Text maximal %(max)d Zeichen hat. (Er hat %(length)d)."
-#: newforms/fields.py:125
+#: forms/fields.py:134
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr "Bitte sicherstellen, dass der Text wenigstens %(min)d Zeichen hat. (Er hat %(length)d.)"
-#: newforms/fields.py:153
-#: newforms/fields.py:182
-#: newforms/fields.py:211
+#: forms/fields.py:162
+#: forms/fields.py:191
+#: forms/fields.py:220
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Dieser Wert darf maximal %s sein."
-#: newforms/fields.py:154
-#: newforms/fields.py:183
-#: newforms/fields.py:212
+#: forms/fields.py:163
+#: forms/fields.py:192
+#: forms/fields.py:221
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Dieser Wert muss größer oder gleich %s sein."
-#: newforms/fields.py:181
-#: newforms/fields.py:210
+#: forms/fields.py:190
+#: forms/fields.py:219
msgid "Enter a number."
msgstr "Bitte eine Zahl eingeben."
-#: newforms/fields.py:213
+#: forms/fields.py:222
#, 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."
-#: newforms/fields.py:214
+#: forms/fields.py:223
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Bitte geben Sie nicht mehr als %s Dezimalstellen ein."
-#: newforms/fields.py:215
+#: forms/fields.py:224
#, 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."
-#: newforms/fields.py:263
-#: newforms/fields.py:750
+#: forms/fields.py:272
+#: forms/fields.py:802
msgid "Enter a valid date."
msgstr "Bitte ein gültiges Datum eingeben."
-#: newforms/fields.py:296
-#: newforms/fields.py:751
+#: forms/fields.py:305
+#: forms/fields.py:803
msgid "Enter a valid time."
msgstr "Bitte eine gültige Uhrzeit eingeben."
-#: newforms/fields.py:335
+#: forms/fields.py:344
msgid "Enter a valid date/time."
-msgstr "Bitte gültiges Datum und Uhrzeit eingeben."
+msgstr "Bitte ein gültiges Datum und Uhrzeit eingeben."
-#: newforms/fields.py:434
+#: forms/fields.py:431
msgid "No file was submitted."
msgstr "Es wurde keine Datei übertragen."
-#: newforms/fields.py:435
-#: oldforms/__init__.py:689
+#: forms/fields.py:432
+#: oldforms/__init__.py:693
msgid "The submitted file is empty."
msgstr "Die ausgewählte Datei ist leer."
-#: newforms/fields.py:497
+#: forms/fields.py:531
msgid "Enter a valid URL."
msgstr "Bitte eine gültige Adresse eingeben."
-#: newforms/fields.py:498
+#: forms/fields.py:532
msgid "This URL appears to be a broken link."
msgstr "Diese Adresse scheint nicht gültig zu sein."
-#: newforms/fields.py:559
-#: newforms/models.py:305
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Bitte eine gültige Auswahl treffen."
-
-#: newforms/fields.py:598
+#: forms/fields.py:600
+#: forms/fields.py:651
#, 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."
-#: newforms/fields.py:599
-#: newforms/fields.py:661
-#: newforms/models.py:372
+#: forms/fields.py:652
+#: forms/fields.py:713
+#: forms/models.py:588
msgid "Enter a list of values."
-msgstr "Eine Liste mit Werten eingeben."
+msgstr "Bitte eine Liste mit Werten eingeben."
-#: newforms/fields.py:779
+#: forms/fields.py:831
msgid "Enter a valid IPv4 address."
msgstr "Bitte eine gültige IPv4-Adresse eingeben."
-#: newforms/models.py:373
+#: forms/models.py:521
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Bitte eine gültige Auswahl treffen."
+
+#: forms/models.py:589
#, 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."
@@ -3920,15 +4056,15 @@ msgstr "Zeilenumbrüche sind hier nicht erlaubt."
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Bitte eine gültige Auswahl treffen; '%(data)s' ist nicht in %(choices)s."
-#: oldforms/__init__.py:745
+#: oldforms/__init__.py:754
msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Bitte eine Ganzzahl zwischen -32.768 und 32.767 eingeben."
+msgstr "Bitte eine ganze Zahl zwischen -32.768 und 32.767 eingeben."
-#: oldforms/__init__.py:755
+#: oldforms/__init__.py:764
msgid "Enter a positive number."
msgstr "Bitte eine ganze, positive Zahl eingeben."
-#: oldforms/__init__.py:765
+#: oldforms/__init__.py:774
msgid "Enter a whole number between 0 and 32,767."
msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben."
@@ -4167,7 +4303,7 @@ msgstr "Nov."
msgid "Dec."
msgstr "Dez."
-#: utils/text.py:127
+#: utils/text.py:128
msgid "or"
msgstr "oder"
@@ -4221,38 +4357,57 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:403
+#: utils/translation/trans_real.py:401
msgid "DATE_FORMAT"
msgstr "j. N Y"
-#: utils/translation/trans_real.py:404
+#: utils/translation/trans_real.py:402
msgid "DATETIME_FORMAT"
msgstr "j. N Y, H:i"
-#: utils/translation/trans_real.py:405
+#: utils/translation/trans_real.py:403
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:421
+#: utils/translation/trans_real.py:419
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:422
+#: utils/translation/trans_real.py:420
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
-#: views/generic/create_update.py:43
+#: views/generic/create_update.py:129
#, python-format
msgid "The %(verbose_name)s was created successfully."
msgstr "%(verbose_name)s wurde erfolgreich angelegt."
-#: views/generic/create_update.py:117
+#: views/generic/create_update.py:172
#, python-format
msgid "The %(verbose_name)s was updated successfully."
msgstr "%(verbose_name)s wurde erfolgreich aktualisiert."
-#: views/generic/create_update.py:184
+#: views/generic/create_update.py:214
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s wurde gelöscht"
+#~ msgid "Ordering"
+#~ msgstr "Sortierung"
+#~ msgid "Order:"
+#~ msgstr "Reihenfolge:"
+#~ msgid "Your new password is: %(new_password)s"
+#~ msgstr "Ihr neues Passwort lautet: %(new_password)s"
+#~ msgid "Feel free to change this password by going to this page:"
+#~ msgstr "Sie können das Passwort auf folgender Seite ändern:"
+#~ msgid "Added %s."
+#~ msgstr "%s hinzugefügt."
+#~ msgid "Deleted %s."
+#~ msgstr "%s gelöscht."
+#~ msgid "The two 'new password' fields didn't match."
+#~ msgstr "Die beiden neuen Passwörter sind nicht identisch."
+#~ msgid "Year must be 1900 or later."
+#~ msgstr "Das Jahr muss 1900 oder später sein."
+#~ msgid "Separate multiple IDs with commas."
+#~ msgstr "Mehrere IDs können mit Komma getrennt werden."
+
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index a2fd2f77db..49f4fa3541 100644
Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index b665fcf9a6..78e6b75b24 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-13 16:14+0200\n"
-"PO-Revision-Date: 2008-06-18 22:45+0200\n"
+"POT-Creation-Date: 2008-07-24 12:48+0200\n"
+"PO-Revision-Date: 2008-07-24 13:30+0100\n"
"Last-Translator: Django Spanish Translation Team \n"
"Language-Team: Django Spanish Translation Team \n"
"MIME-Version: 1.0\n"
@@ -59,146 +59,154 @@ msgid "Spanish"
msgstr "español"
#: conf/global_settings.py:55
+msgid "Estonian"
+msgstr "estonio"
+
+#: conf/global_settings.py:56
msgid "Argentinean Spanish"
msgstr "español de Argentina"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
msgid "Basque"
msgstr "vasco"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
msgid "Persian"
msgstr "persa"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
msgid "Finnish"
msgstr "finés"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "French"
msgstr "francés"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Irish"
msgstr "irlandés"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Galician"
msgstr "gallego"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "Hungarian"
msgstr "húngaro"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Hebrew"
msgstr "hebreo"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Croatian"
msgstr "croata"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Icelandic"
msgstr "islandés"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Japanese"
msgstr "japonés"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Georgian"
msgstr "georgiano"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Korean"
msgstr "koreano"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Latvian"
msgstr "letón"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
+msgid "Lithuanian"
+msgstr "lituano"
+
+#: conf/global_settings.py:75
msgid "Macedonian"
msgstr "macedonio"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:76
msgid "Dutch"
msgstr "holandés"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:77
msgid "Norwegian"
msgstr "noruego"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:78
msgid "Polish"
msgstr "polaco"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:79
msgid "Portugese"
msgstr "portugués"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:80
msgid "Brazilian Portuguese"
msgstr "portugués de Brasil"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:81
msgid "Romanian"
msgstr "rumano"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:82
msgid "Russian"
msgstr "ruso"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:83
msgid "Slovak"
msgstr "eslovaco"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:84
msgid "Slovenian"
msgstr "esloveno"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:85
msgid "Serbian"
msgstr "serbio"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:86
msgid "Swedish"
msgstr "sueco"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:87
msgid "Tamil"
msgstr "tamil"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:88
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:89
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:90
msgid "Ukrainian"
msgstr "ucraniano"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:91
msgid "Simplified Chinese"
msgstr "chino simplificado"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:92
msgid "Traditional Chinese"
msgstr "chino tradicional"
@@ -211,8 +219,10 @@ msgstr ""
"
Por %s:
\n"
"
\n"
-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74
+#: contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147
+#: contrib/admin/filterspecs.py:173
msgid "All"
msgstr "Todo"
@@ -236,49 +246,209 @@ msgstr "Este mes"
msgid "This year"
msgstr "Este año"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147
+#: forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Yes"
msgstr "Sí"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147
+#: forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "No"
msgstr "No"
-#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:154
+#: forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Unknown"
msgstr "Desconocido"
-#: contrib/admin/models.py:18
+#: contrib/admin/models.py:19
msgid "action time"
msgstr "hora de acción"
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
msgid "object id"
msgstr "id de objeto"
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
msgid "object repr"
msgstr "repr de objeto"
-#: contrib/admin/models.py:23
+#: contrib/admin/models.py:24
msgid "action flag"
msgstr "marca de acción"
-#: contrib/admin/models.py:24
+#: contrib/admin/models.py:25
msgid "change message"
msgstr "mensaje de cambio"
-#: contrib/admin/models.py:27
+#: contrib/admin/models.py:28
msgid "log entry"
msgstr "entrada de registro"
-#: contrib/admin/models.py:28
+#: contrib/admin/models.py:29
msgid "log entries"
msgstr "entradas de registro"
+#: contrib/admin/options.py:161
+#: contrib/admin/options.py:180
+msgid "None"
+msgstr "Ninguno"
+
+#: contrib/admin/options.py:347
+#: contrib/auth/admin.py:37
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"."
+
+#: contrib/admin/options.py:351
+#: contrib/admin/options.py:419
+#: contrib/auth/admin.py:42
+msgid "You may edit it again below."
+msgstr "Puede editarlo de nuevo abajo."
+
+#: contrib/admin/options.py:361
+#: contrib/admin/options.py:428
+#, python-format
+msgid "You may add another %s below."
+msgstr "Puede añadir otro %s abajo."
+
+#: contrib/admin/options.py:395
+#, python-format
+msgid "Changed %s."
+msgstr "Modificado/a %s."
+
+#: contrib/admin/options.py:395
+#: contrib/admin/options.py:405
+#: core/validators.py:279
+#: db/models/manipulators.py:305
+msgid "and"
+msgstr "y"
+
+#: contrib/admin/options.py:400
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "Añadido/a \"%(object)s\" %(name)s."
+
+#: contrib/admin/options.py:404
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "Modificados %(list)s para \"%(object)s\" %(name)s."
+
+#: contrib/admin/options.py:409
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "Eliminado/a \"%(object)s\" %(name)s."
+
+#: contrib/admin/options.py:414
+msgid "No fields changed."
+msgstr "No ha cambiado ningún campo."
+
+#: contrib/admin/options.py:417
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Se modificó con éxito el %(name)s \"%(obj)s\"."
+
+#: contrib/admin/options.py:425
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "Se añadió con éxito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo."
+
+#: contrib/admin/options.py:506
+#, python-format
+msgid "Add %s"
+msgstr "Añadir %s"
+
+#: contrib/admin/options.py:568
+#, python-format
+msgid "Change %s"
+msgstr "Modificar %s"
+
+#: contrib/admin/options.py:598
+msgid "Database error"
+msgstr "Error en la base de datos"
+
+#: contrib/admin/options.py:647
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"."
+
+#: contrib/admin/options.py:653
+msgid "Are you sure?"
+msgstr "¿Está seguro?"
+
+#: contrib/admin/options.py:680
+#, python-format
+msgid "Change history: %s"
+msgstr "Histórico de modificaciones: %s"
+
+#: contrib/admin/sites.py:18
+#: contrib/admin/views/decorators.py:16
+#: contrib/auth/forms.py:70
+#: contrib/comments/views/comments.py:56
+msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
+msgstr "Por favor, introduzca un nombre de usuario y contraseña correctos. Note que ambos campos son sensibles a mayúsculas/minúsculas."
+
+#: contrib/admin/sites.py:233
+#: contrib/admin/views/decorators.py:68
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgstr "Por favor, inicie sesión de nuevo, ya que su sesión ha caducado. No se preocupe: se ha guardado su envío."
+
+#: contrib/admin/sites.py:240
+#: contrib/admin/views/decorators.py:75
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
+msgstr "Parece que su navegador no está configurado para aceptar cookies. Actívelas , recargue esta página, e inténtelo de nuevo."
+
+#: contrib/admin/sites.py:254
+#: contrib/admin/sites.py:260
+#: contrib/admin/views/decorators.py:92
+msgid "Usernames cannot contain the '@' character."
+msgstr "Los nombres de usuario no pueden contener el carácter '@'."
+
+#: contrib/admin/sites.py:257
+#: contrib/admin/views/decorators.py:88
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Su dirección de correo no es su nombre de usuario. Pruebe con '%s' en su lugar."
+
+#: contrib/admin/sites.py:325
+msgid "Site administration"
+msgstr "Sitio administrativo"
+
+#: contrib/admin/sites.py:347
+#: contrib/admin/templates/admin/login.html:27
+#: contrib/admin/views/decorators.py:30
+msgid "Log in"
+msgstr "Iniciar sesión"
+
+#: contrib/admin/util.py:126
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Uno o más %(fieldname)s en %(name)s: %(obj)s"
+
+#: contrib/admin/util.py:131
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Uno o más %(fieldname)s en %(name)s:"
+
+#: contrib/admin/widgets.py:65
+msgid "Date:"
+msgstr "Fecha:"
+
+#: contrib/admin/widgets.py:65
+msgid "Time:"
+msgstr "Hora:"
+
+#: contrib/admin/widgets.py:89
+msgid "Currently:"
+msgstr "Actualmente:"
+
+#: contrib/admin/widgets.py:89
+msgid "Change:"
+msgstr "Modificar:"
+
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
msgid "Page not found"
@@ -289,17 +459,17 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Lo sentimos, pero no se encuentra la página solicitada."
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:37
-#: contrib/admin/templates/admin/change_form.html:12
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:4
-#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
msgid "Home"
@@ -318,30 +488,31 @@ msgid "Server Error (500)"
msgstr "Error de servidor (500)"
#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Ha ocurrido un error. Se ha informado a los administradores del sitio "
-"mediante correo electrónico y debería arreglarse en breve. Gracias por su "
-"paciencia."
+msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
+msgstr "Ha ocurrido un error. Se ha informado a los administradores del sitio mediante correo electrónico y debería arreglarse en breve. Gracias por su paciencia."
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:25
msgid "Welcome,"
msgstr "Bienvenido/a,"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:25
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Documentation"
msgstr "Documentación"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:45
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:13
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Change password"
msgstr "Cambiar contraseña"
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/comments/templates/comments/form.html:6
msgid "Log out"
msgstr "Terminar sesión"
@@ -354,66 +525,53 @@ msgstr "Sitio de administración de Django"
msgid "Django administration"
msgstr "Administración de Django"
-#: contrib/admin/templates/admin/change_form.html:14
-#: contrib/admin/templates/admin/index.html:28
+#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/index.html:29
msgid "Add"
msgstr "Añadir"
-#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/change_form.html:26
+#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Histórico"
-#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/change_form.html:27
msgid "View on site"
msgstr "Ver en el sitio"
-#: contrib/admin/templates/admin/change_form.html:31
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:37
+#: contrib/admin/templates/admin/auth/user/change_password.html:22
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Por favor, corrija el siguiente error."
msgstr[1] "Por favor, corrija los siguientes errores."
-#: contrib/admin/templates/admin/change_form.html:49
-msgid "Ordering"
-msgstr "Ordenación"
-
-#: contrib/admin/templates/admin/change_form.html:52
-msgid "Order:"
-msgstr "Orden:"
-
-#: contrib/admin/templates/admin/change_list.html:11
+#: contrib/admin/templates/admin/change_list.html:16
#, python-format
msgid "Add %(name)s"
msgstr "Añadir %(name)s"
-#: contrib/admin/templates/admin/delete_confirmation.html:8
+#: contrib/admin/templates/admin/change_list.html:26
+msgid "Filter"
+msgstr "Filtro"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:9
#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
msgid "Delete"
msgstr "Eliminar"
-#: contrib/admin/templates/admin/delete_confirmation.html:13
+#: contrib/admin/templates/admin/delete_confirmation.html:15
#, 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 ""
-"Eliminar el %(object_name)s '%(escaped_object)s' provocaría la eliminación "
-"de objetos relacionados, pero su cuenta no tiene permiso para borrar los "
-"siguientes tipos de objetos:"
+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 "Eliminar el %(object_name)s '%(escaped_object)s' provocaría la eliminación de objetos relacionados, pero su cuenta no tiene permiso para borrar los siguientes tipos de objetos:"
-#: contrib/admin/templates/admin/delete_confirmation.html:20
+#: contrib/admin/templates/admin/delete_confirmation.html:22
#, python-format
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
-"All of the following related items will be deleted:"
-msgstr ""
-"¿Está seguro de que quiere borrar los %(object_name)s \"%(escaped_object)s"
-"\"? Se borrarán los siguientes objetos relacionados:"
+msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
+msgstr "¿Está seguro de que quiere borrar los %(object_name)s \"%(escaped_object)s\"? Se borrarán los siguientes objetos relacionados:"
-#: contrib/admin/templates/admin/delete_confirmation.html:25
+#: contrib/admin/templates/admin/delete_confirmation.html:27
msgid "Yes, I'm sure"
msgstr "Sí, estoy seguro"
@@ -422,89 +580,70 @@ msgstr "Sí, estoy seguro"
msgid " By %(filter_title)s "
msgstr " Por %(filter_title)s "
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filtro"
-
-#: contrib/admin/templates/admin/index.html:17
+#: contrib/admin/templates/admin/index.html:18
#, python-format
msgid "Models available in the %(name)s application."
msgstr "Modelos disponibles en la aplicación %(name)s."
-#: contrib/admin/templates/admin/index.html:18
+#: contrib/admin/templates/admin/index.html:19
#, python-format
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/index.html:34
+#: contrib/admin/templates/admin/index.html:35
msgid "Change"
msgstr "Modificar"
-#: contrib/admin/templates/admin/index.html:44
+#: contrib/admin/templates/admin/index.html:45
msgid "You don't have permission to edit anything."
msgstr "No tiene permiso para editar nada."
-#: contrib/admin/templates/admin/index.html:52
+#: contrib/admin/templates/admin/index.html:53
msgid "Recent Actions"
msgstr "Acciones recientes"
-#: contrib/admin/templates/admin/index.html:53
+#: contrib/admin/templates/admin/index.html:54
msgid "My Actions"
msgstr "Mis acciones"
-#: contrib/admin/templates/admin/index.html:57
+#: contrib/admin/templates/admin/index.html:58
msgid "None available"
msgstr "Ninguno disponible"
-#: contrib/admin/templates/admin/invalid_setup.html:8
-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 ""
-"Algo va mal con la instalación de la base de datos. Asegúrese que las tablas "
-"necesarias han sido creadas, y que la base de datos puede ser leída por el "
-"usuario apropiado."
+#: 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 "Algo va mal con la instalación de la base de datos. Asegúrese que las tablas necesarias han sido creadas, y que la base de datos puede ser leída por el usuario apropiado."
-#: contrib/admin/templates/admin/login.html:17
+#: contrib/admin/templates/admin/login.html:19
#: contrib/comments/templates/comments/form.html:6
#: contrib/comments/templates/comments/form.html:8
msgid "Username:"
msgstr "Usuario:"
-#: contrib/admin/templates/admin/login.html:20
+#: contrib/admin/templates/admin/login.html:22
#: contrib/comments/templates/comments/form.html:8
msgid "Password:"
msgstr "Contraseña:"
-#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:31
-msgid "Log in"
-msgstr "Iniciar sesión"
-
-#: contrib/admin/templates/admin/object_history.html:17
+#: contrib/admin/templates/admin/object_history.html:16
msgid "Date/time"
msgstr "Fecha/hora"
-#: contrib/admin/templates/admin/object_history.html:18
+#: contrib/admin/templates/admin/object_history.html:17
msgid "User"
msgstr "Usuario"
-#: contrib/admin/templates/admin/object_history.html:19
+#: contrib/admin/templates/admin/object_history.html:18
msgid "Action"
msgstr "Acción"
-#: contrib/admin/templates/admin/object_history.html:25
+#: contrib/admin/templates/admin/object_history.html:24
msgid "DATE_WITH_TIME_FULL"
msgstr "j M Y P"
-#: contrib/admin/templates/admin/object_history.html:35
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
-msgstr ""
-"Este objeto no tiene histórico de cambios. Probablemente no fue añadido "
-"usando este sitio de administración."
+#: contrib/admin/templates/admin/object_history.html:32
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
+msgstr "Este objeto no tiene histórico de cambios. Probablemente no fue añadido usando este sitio de administración."
#: contrib/admin/templates/admin/pagination.html:10
msgid "Show all"
@@ -543,38 +682,38 @@ msgid "Save"
msgstr "Grabar"
#: 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."
-msgstr ""
-"Primero introduzca un nombre de usuario y una contraseña. Luego podrá editar "
-"el resto de opciones del usuario."
+msgid "First, enter a username and password. Then, you'll be able to edit more user options."
+msgstr "Primero introduzca un nombre de usuario y una contraseña. Luego podrá editar el resto de opciones del usuario."
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
+#: contrib/admin/templates/admin/auth/user/add_form.html:13
+#: contrib/auth/forms.py:12
+#: contrib/auth/forms.py:49
msgid "Username"
msgstr "Nombre de usuario"
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/add_form.html:20
#: contrib/admin/templates/admin/auth/user/change_password.html:33
+#: contrib/auth/forms.py:15
+#: contrib/auth/forms.py:50
+#: contrib/auth/forms.py:166
msgid "Password"
msgstr "Contraseña"
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:38
+#: contrib/admin/templates/admin/auth/user/add_form.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/auth/forms.py:167
msgid "Password (again)"
msgstr "Contraseña (de nuevo)"
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: 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 "Introduzca la misma contraseña que arriba, para verificación."
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:26
#, python-format
msgid "Enter a new password for the user %(username)s."
-msgstr ""
-"Introduzca una nueva contraseña para el usuario %(username)s"
-"strong>."
+msgstr "Introduzca una nueva contraseña para el usuario %(username)s."
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
@@ -596,36 +735,27 @@ msgid ""
msgstr ""
"\n"
"
Para instalar bookmarklets, arrastre el enlace a su barra\n"
-"de favoritos, o pulse con el botón derecho el enlace y añádalo a sus "
-"favoritos.\n"
+"de favoritos, o pulse con el botón derecho el enlace y añádalo a sus favoritos.\n"
"Ahora puede escoger el bookmarklet desde cualquier página del sitio.\n"
"Observe que algunos de estos bookmarklets precisan que esté viendo\n"
"el sitio desde un ordenador señalado como \"interno\" (hable\n"
-"con su administrador de sistemas si no está seguro si el suyo lo es)."
-"p>\n"
+"con su administrador de sistemas si no está seguro si el suyo lo es).
\n"
#: contrib/admin/templates/admin_doc/bookmarklets.html:18
msgid "Documentation for this page"
msgstr "Documentación para esta página"
#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid ""
-"Jumps you from any page to the documentation for the view that generates "
-"that page."
-msgstr ""
-"Lleva desde cualquier página a la documentación de la vista que la genera."
+msgid "Jumps you from any page to the documentation for the view that generates that page."
+msgstr "Lleva desde cualquier página a la documentación de la vista que la genera."
#: contrib/admin/templates/admin_doc/bookmarklets.html:21
msgid "Show object ID"
msgstr "Mostrar ID de objeto"
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid ""
-"Shows the content-type and unique ID for pages that represent a single "
-"object."
-msgstr ""
-"Muestra el tipo de contenido e ID único de las páginas que representan un "
-"simple objeto."
+msgid "Shows the content-type and unique ID for pages that represent a single object."
+msgstr "Muestra el tipo de contenido e ID único de las páginas que representan un simple objeto."
#: contrib/admin/templates/admin_doc/bookmarklets.html:24
msgid "Edit this object (current window)"
@@ -633,9 +763,7 @@ msgstr "Editar este objeto (ventana actual)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
-"Lleva a la página de administración de páginas que representan un único "
-"objeto."
+msgstr "Lleva a la página de administración de páginas que representan un único objeto."
#: contrib/admin/templates/admin_doc/bookmarklets.html:27
msgid "Edit this object (new window)"
@@ -643,8 +771,7 @@ msgstr "Editar este objeto (nueva ventana)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:28
msgid "As above, but opens the admin page in a new window."
-msgstr ""
-"Como antes, pero abre la página de administración en una nueva ventana."
+msgstr "Como antes, pero abre la página de administración en una nueva ventana."
#: contrib/admin/templates/registration/logged_out.html:8
msgid "Thanks for spending some quality time with the Web site today."
@@ -654,43 +781,39 @@ msgstr "Gracias por el tiempo que ha dedicado hoy al sitio web."
msgid "Log in again"
msgstr "Iniciar sesión de nuevo"
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_form.html:5
-#: contrib/admin/templates/registration/password_change_form.html:9
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
msgid "Password change"
msgstr "Cambio de contraseña"
-#: contrib/admin/templates/registration/password_change_done.html:5
-#: contrib/admin/templates/registration/password_change_done.html:9
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
msgid "Password change successful"
msgstr "Cambio de contraseña exitoso"
-#: contrib/admin/templates/registration/password_change_done.html:11
+#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
msgstr "Su contraseña ha sido cambiada."
-#: contrib/admin/templates/registration/password_change_form.html:11
-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 ""
-"Por favor, introduzca su contraseña antigua, por seguridad, y después introduzca "
-"la nueva contraseña dos veces para verificar que la ha escrito correctamente."
+#: 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 "Por favor, introduzca su contraseña antigua, por seguridad, y después introduzca la nueva contraseña dos veces para verificar que la ha escrito correctamente."
-#: contrib/admin/templates/registration/password_change_form.html:16
+#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
msgstr "Contraseña antigua:"
-#: contrib/admin/templates/registration/password_change_form.html:18
+#: contrib/admin/templates/registration/password_change_form.html:19
msgid "New password:"
msgstr "Contraseña nueva:"
-#: contrib/admin/templates/registration/password_change_form.html:20
+#: contrib/admin/templates/registration/password_change_form.html:21
msgid "Confirm password:"
msgstr "Confirme contraseña:"
-#: contrib/admin/templates/registration/password_change_form.html:22
+#: contrib/admin/templates/registration/password_change_form.html:23
msgid "Change my password"
msgstr "Cambiar mi contraseña"
@@ -707,12 +830,8 @@ msgid "Password reset successful"
msgstr "Restablecimiento de contraseña exitoso"
#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"Le hemos enviado una contraseña nueva a la dirección que ha suministrado. Debería "
-"recibirla en breve."
+msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
+msgstr "Le hemos enviado una contraseña nueva a la dirección que ha suministrado. Debería recibirla en breve."
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
@@ -746,12 +865,8 @@ msgid "The %(site_name)s team"
msgstr "El equipo de %(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 reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"¿Ha olvidado su contraseña? Introduzca su dirección de correo electrónico, y "
-"crearemos una nueva que le enviaremos por correo."
+msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
+msgstr "¿Ha olvidado su contraseña? Introduzca su dirección de correo electrónico, y crearemos una nueva que le enviaremos por correo."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -761,363 +876,257 @@ msgstr "Dirección de correo electrónico:"
msgid "Reset my password"
msgstr "Restablecer mi contraseña"
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Fecha:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Hora:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Actualmente:"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Modificar:"
-
#: contrib/admin/templatetags/admin_list.py:257
msgid "All dates"
msgstr "Todas las fechas"
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
+#: contrib/admin/views/main.py:65
#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"."
-
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
-#: contrib/admin/views/main.py:356
-msgid "You may edit it again below."
-msgstr "Puede editarlo de nuevo abajo."
-
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr "Añadir usuario"
-
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
-msgstr "La contraseña se ha cambiado con éxito."
-
-#: contrib/admin/views/auth.py:65
-#, python-format
-msgid "Change password: %s"
-msgstr "Cambiar contraseña: %s"
-
-#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Por favor, introduzca un nombre de usuario y contraseña correctos. Note que "
-"ambos campos son sensibles a mayúsculas/minúsculas."
-
-#: contrib/admin/views/decorators.py:69
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"Por favor, inicie sesión de nuevo, ya que su sesión ha caducado. No se "
-"preocupe: se ha guardado su envío."
-
-#: contrib/admin/views/decorators.py:76
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"Parece que su navegador no está configurado para aceptar cookies. Actívelas "
-", recargue esta página, e inténtelo de nuevo."
+msgid "Select %s"
+msgstr "Escoja %s"
-#: contrib/admin/views/decorators.py:89
+#: contrib/admin/views/main.py:65
#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Su dirección de correo no es su nombre de usuario. Pruebe con '%s' en su "
-"lugar."
-
-#: contrib/admin/views/decorators.py:93
-msgid "Usernames cannot contain the '@' character."
-msgstr "Los nombres de usuario no pueden contener el carácter '@'."
+msgid "Select %s to change"
+msgstr "Escoja %s a modificar"
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
-#: contrib/admin/views/doc.py:52
+#: contrib/admindocs/views.py:53
+#: contrib/admindocs/views.py:55
+#: contrib/admindocs/views.py:57
msgid "tag:"
msgstr "etiqueta:"
-#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
-#: contrib/admin/views/doc.py:83
+#: contrib/admindocs/views.py:87
+#: contrib/admindocs/views.py:89
+#: contrib/admindocs/views.py:91
msgid "filter:"
msgstr "filtro:"
-#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
-#: contrib/admin/views/doc.py:141
+#: contrib/admindocs/views.py:153
+#: contrib/admindocs/views.py:155
+#: contrib/admindocs/views.py:157
msgid "view:"
msgstr "vista:"
-#: contrib/admin/views/doc.py:166
+#: contrib/admindocs/views.py:187
#, python-format
msgid "App %r not found"
msgstr "Aplicación %r no encontrada"
-#: contrib/admin/views/doc.py:173
+#: contrib/admindocs/views.py:194
#, python-format
-msgid "Model %(name)r not found in app %(label)r"
-msgstr "El modelo %(name)s no se ha encontrado en la aplicación %(label)r"
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr "El modelo %(model_name)r no se ha encontrado en la aplicación %(app_label)r"
-#: contrib/admin/views/doc.py:185
+#: contrib/admindocs/views.py:206
#, python-format
-msgid "the related `%(label)s.%(type)s` object"
-msgstr "el objeto relacionado `%(label)s.%(type)s`"
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "el objeto relacionado `%(app_label)s.%(data_type)s`"
-#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
-#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:206
+#: contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:242
+#: contrib/admindocs/views.py:247
msgid "model:"
msgstr "modelo:"
-#: contrib/admin/views/doc.py:216
+#: contrib/admindocs/views.py:237
#, python-format
-msgid "related `%(label)s.%(name)s` objects"
-msgstr "los objetos relacionados `%(label)s.%(name)s`"
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "los objetos relacionados `%(app_label)s.%(object_name)s`"
-#: contrib/admin/views/doc.py:221
+#: contrib/admindocs/views.py:242
#, python-format
msgid "all %s"
msgstr "todo %s"
-#: contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:247
#, python-format
msgid "number of %s"
msgstr "número de %s"
-#: contrib/admin/views/doc.py:231
+#: contrib/admindocs/views.py:253
#, python-format
msgid "Fields on %s objects"
msgstr "Campos en %s objetos"
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
-#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
-#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
+#: contrib/admindocs/views.py:317
+#: contrib/admindocs/views.py:328
+#: contrib/admindocs/views.py:330
+#: contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:337
+#: contrib/admindocs/views.py:339
msgid "Integer"
msgstr "Entero"
-#: contrib/admin/views/doc.py:294
+#: contrib/admindocs/views.py:318
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadero o Falso)"
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
+#: contrib/admindocs/views.py:319
+#: contrib/admindocs/views.py:338
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
-#: contrib/admin/views/doc.py:296
+#: contrib/admindocs/views.py:320
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
-#: contrib/admin/views/doc.py:297
+#: contrib/admindocs/views.py:321
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
-#: contrib/admin/views/doc.py:298
+#: contrib/admindocs/views.py:322
msgid "Date (with time)"
msgstr "Fecha (con hora)"
-#: contrib/admin/views/doc.py:299
+#: contrib/admindocs/views.py:323
msgid "Decimal number"
msgstr "Número decimal"
-#: contrib/admin/views/doc.py:300
+#: contrib/admindocs/views.py:324
msgid "E-mail address"
msgstr "Dirección de correo electrónico"
-#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
-#: contrib/admin/views/doc.py:305
+#: contrib/admindocs/views.py:325
+#: contrib/admindocs/views.py:326
+#: contrib/admindocs/views.py:329
msgid "File path"
msgstr "Ruta de fichero"
-#: contrib/admin/views/doc.py:303
+#: contrib/admindocs/views.py:327
msgid "Floating point number"
msgstr "Número en coma flotante"
-#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89
+#: contrib/admindocs/views.py:331
+#: contrib/comments/models.py:89
msgid "IP address"
msgstr "Dirección IP"
-#: contrib/admin/views/doc.py:309
+#: contrib/admindocs/views.py:333
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
-#: contrib/admin/views/doc.py:310
+#: contrib/admindocs/views.py:334
msgid "Relation to parent model"
msgstr "Relación con el modelo padre"
-#: contrib/admin/views/doc.py:311
+#: contrib/admindocs/views.py:335
msgid "Phone number"
msgstr "Número de teléfono"
-#: contrib/admin/views/doc.py:316
+#: contrib/admindocs/views.py:340
msgid "Text"
msgstr "Texto"
-#: contrib/admin/views/doc.py:317
+#: contrib/admindocs/views.py:341
msgid "Time"
msgstr "Hora"
-#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:8
+#: contrib/admindocs/views.py:342
+#: contrib/flatpages/models.py:8
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:319
+#: contrib/admindocs/views.py:343
msgid "U.S. state (two uppercase letters)"
msgstr "Estado de los EEUU (dos letras mayúsculas)"
-#: contrib/admin/views/doc.py:320
+#: contrib/admindocs/views.py:344
msgid "XML text"
msgstr "Texto XML"
-#: contrib/admin/views/doc.py:346
+#: contrib/admindocs/views.py:370
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s no parece ser un objeto urlpattern"
-#: contrib/admin/views/main.py:233
-msgid "Site administration"
-msgstr "Sitio administrativo"
-
-#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puede añadir otro %s abajo."
-
-#: contrib/admin/views/main.py:298
-#, python-format
-msgid "Add %s"
-msgstr "Añadir %s"
-
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Added %s."
-msgstr "Añadido %s."
-
-#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
-#: contrib/admin/views/main.py:348 core/validators.py:283
-#: db/models/manipulators.py:309
-msgid "and"
-msgstr "y"
-
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Changed %s."
-msgstr "Modificado %s."
-
-#: contrib/admin/views/main.py:348
-#, python-format
-msgid "Deleted %s."
-msgstr "Borrado %s."
-
-#: contrib/admin/views/main.py:351
-msgid "No fields changed."
-msgstr "No ha cambiado ningún campo."
-
-#: contrib/admin/views/main.py:354
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Se modificó con éxito el %(name)s \"%(obj)s\"."
-
-#: contrib/admin/views/main.py:362
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-"Se añadió con éxito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo."
-
-#: contrib/admin/views/main.py:400
-#, python-format
-msgid "Change %s"
-msgstr "Modificar %s"
-
-#: contrib/admin/views/main.py:487
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Uno o más %(fieldname)s en %(name)s: %(obj)s"
-
-#: contrib/admin/views/main.py:492
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Uno o más %(fieldname)s en %(name)s:"
+#: contrib/auth/admin.py:17
+msgid "Personal info"
+msgstr "Información personal"
-#: contrib/admin/views/main.py:524
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"."
+#: contrib/auth/admin.py:18
+msgid "Permissions"
+msgstr "Permisos"
-#: contrib/admin/views/main.py:527
-msgid "Are you sure?"
-msgstr "¿Está seguro?"
+#: contrib/auth/admin.py:19
+msgid "Important dates"
+msgstr "Fechas importantes"
-#: contrib/admin/views/main.py:549
-#, python-format
-msgid "Change history: %s"
-msgstr "Histórico de modificaciones: %s"
+#: contrib/auth/admin.py:20
+msgid "Groups"
+msgstr "Grupos"
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s"
-msgstr "Escoja %s"
+#: contrib/auth/admin.py:47
+msgid "Add user"
+msgstr "Añadir usuario"
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s to change"
-msgstr "Escoja %s a modificar"
+#: contrib/auth/forms.py:13
+#: contrib/auth/models.py:134
+msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
+msgstr "Requerido. 30 caracteres o menos. Sólo caracteres alfanuméricos (letras, dígitos y guiones bajos)."
-#: contrib/admin/views/main.py:765
-msgid "Database error"
-msgstr "Error en la base de datos"
+#: contrib/auth/forms.py:14
+#: core/validators.py:72
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Este valor debe contener sólo letras, números y guiones bajos."
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
-msgid "The two password fields didn't match."
-msgstr "Las dos contraseñas no coinciden."
+#: contrib/auth/forms.py:16
+msgid "Password confirmation"
+msgstr "Contraseña (confirmación)"
-#: contrib/auth/forms.py:25
+#: contrib/auth/forms.py:28
msgid "A user with that username already exists."
msgstr "Ya existe un usuario con este nombre."
-#: contrib/auth/forms.py:53
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-"Su navegador no parece tener las cookies habilitadas. Las "
-"cookies se necesitan para poder ingresar."
+#: contrib/auth/forms.py:34
+#: contrib/auth/forms.py:153
+#: contrib/auth/forms.py:178
+msgid "The two password fields didn't match."
+msgstr "Las dos contraseñas no coinciden."
-#: contrib/auth/forms.py:62
+#: contrib/auth/forms.py:72
+#: contrib/comments/views/comments.py:58
msgid "This account is inactive."
msgstr "Esta cuenta está inactiva."
-#: contrib/auth/forms.py:84
-msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
-"you've registered?"
-msgstr ""
-"Esta dirección de correo electrónico no tiene una cuenta de usuario "
-"asociada. ¿Está seguro de que se ha registrado?"
+#: contrib/auth/forms.py:77
+#: contrib/comments/views/comments.py:49
+msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
+msgstr "Su navegador no parece tener las cookies habilitadas. Las cookies se necesitan para poder ingresar."
-#: contrib/auth/forms.py:107
+#: contrib/auth/forms.py:90
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#: contrib/auth/forms.py:99
+msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?"
+msgstr "Esta dirección de correo electrónico no tiene una cuenta de usuario asociada. ¿Está seguro de que se ha registrado?"
+
+#: contrib/auth/forms.py:124
#, python-format
msgid "Password reset on %s"
msgstr "Contraseña restablecida en %s"
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr ""
-"Los dos campos 'nueva contraseña' no coinciden."
+#: contrib/auth/forms.py:131
+msgid "Old password"
+msgstr "Contraseña antigua"
-#: contrib/auth/forms.py:124
+#: contrib/auth/forms.py:132
+msgid "New password"
+msgstr "Contraseña nueva"
+
+#: contrib/auth/forms.py:133
+msgid "New password confirmation"
+msgstr "Contraseña nueva (confirmación):"
+
+#: contrib/auth/forms.py:145
msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr ""
-"Su contraseña antigua es incorrecta. Por favor, vuelva a introducirla "
-"correctamente."
+msgstr "Su contraseña antigua es incorrecta. Por favor, vuelva a introducirla correctamente."
-#: contrib/auth/models.py:73 contrib/auth/models.py:93
+#: contrib/auth/models.py:73
+#: contrib/auth/models.py:93
msgid "name"
msgstr "nombre"
@@ -1129,7 +1138,8 @@ msgstr "nombre en código"
msgid "permission"
msgstr "permiso"
-#: contrib/auth/models.py:79 contrib/auth/models.py:94
+#: contrib/auth/models.py:79
+#: contrib/auth/models.py:94
msgid "permissions"
msgstr "permisos"
@@ -1137,131 +1147,102 @@ msgstr "permisos"
msgid "group"
msgstr "grupo"
-#: contrib/auth/models.py:98 contrib/auth/models.py:148
+#: contrib/auth/models.py:98
+#: contrib/auth/models.py:144
msgid "groups"
msgstr "grupos"
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:134
msgid "username"
msgstr "nombre de usuario"
-#: contrib/auth/models.py:138
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
-msgstr ""
-"Requerido. 30 caracteres o menos. Sólo caracteres alfanuméricos (letras, "
-"dígitos y guiones bajos)."
-
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:135
msgid "first name"
msgstr "nombre propio"
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:136
msgid "last name"
msgstr "apellidos"
-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:137
msgid "e-mail address"
msgstr "dirección de correo electrónico"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:138
msgid "password"
msgstr "contraseña"
-#: contrib/auth/models.py:142
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the change "
-"password form."
-msgstr ""
-"Use'[algo]$[sal]$[hash hexadecimal]' o use el "
-"formulario para cambiar la contraseña."
+#: contrib/auth/models.py:138
+msgid "Use '[algo]$[salt]$[hexdigest]' or use the change password form."
+msgstr "Use'[algo]$[sal]$[hash hexadecimal]' o use el formulario para cambiar la contraseña."
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:139
msgid "staff status"
msgstr "es staff"
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:139
msgid "Designates whether the user can log into this admin site."
msgstr "Indica si el usuario puede entrar en este sitio de administración."
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:140
msgid "active"
msgstr "activo"
-#: contrib/auth/models.py:144
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Indica si el usuario puede ser tratado como activo. Desmarque "
-"esta opción en lugar de borrar la cuenta."
+#: contrib/auth/models.py:140
+msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
+msgstr "Indica si el usuario puede ser tratado como activo. Desmarque esta opción en lugar de borrar la cuenta."
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:141
msgid "superuser status"
msgstr "es superusuario"
-#: contrib/auth/models.py:145
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Indica que este usuario tiene todos los permisos sin asignárselos "
-"explícitamente."
+#: contrib/auth/models.py:141
+msgid "Designates that this user has all permissions without explicitly assigning them."
+msgstr "Indica que este usuario tiene todos los permisos sin asignárselos explícitamente."
-#: contrib/auth/models.py:146
+#: contrib/auth/models.py:142
msgid "last login"
msgstr "último inicio de sesión"
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:143
msgid "date joined"
msgstr "fecha de alta"
-#: contrib/auth/models.py:149
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr ""
-"Además de los permisos asignados manualmente, este usuario también tendrá "
-"todos los permisos de los grupos en los que esté."
+#: contrib/auth/models.py:145
+msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
+msgstr "Además de los permisos asignados manualmente, este usuario también tendrá todos los permisos de los grupos en los que esté."
-#: contrib/auth/models.py:150
+#: contrib/auth/models.py:146
msgid "user permissions"
msgstr "permisos de usuario"
-#: contrib/auth/models.py:154
+#: contrib/auth/models.py:150
msgid "user"
msgstr "usuario"
-#: contrib/auth/models.py:155
+#: contrib/auth/models.py:151
msgid "users"
msgstr "usuarios"
-#: contrib/auth/models.py:161
-msgid "Personal info"
-msgstr "Información personal"
-
-#: contrib/auth/models.py:162
-msgid "Permissions"
-msgstr "Permisos"
-
-#: contrib/auth/models.py:163
-msgid "Important dates"
-msgstr "Fechas importantes"
-
-#: contrib/auth/models.py:164
-msgid "Groups"
-msgstr "Grupos"
-
-#: contrib/auth/models.py:323
+#: contrib/auth/models.py:306
msgid "message"
msgstr "mensaje"
-#: contrib/auth/views.py:47
+#: contrib/auth/views.py:49
msgid "Logged out"
msgstr "Sesión terminada"
-#: contrib/comments/models.py:71 contrib/comments/models.py:176
+#: contrib/auth/views.py:116
+msgid "Password changed successfully."
+msgstr "La contraseña se ha cambiado con éxito."
+
+#: contrib/auth/views.py:122
+#, python-format
+msgid "Change password: %s"
+msgstr "Cambiar contraseña: %s"
+
+#: contrib/comments/models.py:71
+#: contrib/comments/models.py:164
msgid "object ID"
msgstr "ID de objeto"
@@ -1269,8 +1250,9 @@ msgstr "ID de objeto"
msgid "headline"
msgstr "encabezado"
-#: contrib/comments/models.py:73 contrib/comments/models.py:95
-#: contrib/comments/models.py:177
+#: contrib/comments/models.py:73
+#: contrib/comments/models.py:95
+#: contrib/comments/models.py:165
msgid "comment"
msgstr "comentario"
@@ -1310,11 +1292,13 @@ msgstr "puntuación 8"
msgid "is valid rating"
msgstr "puntuación válida"
-#: contrib/comments/models.py:87 contrib/comments/models.py:179
+#: contrib/comments/models.py:87
+#: contrib/comments/models.py:167
msgid "date/time submitted"
msgstr "fecha/hora de envío"
-#: contrib/comments/models.py:88 contrib/comments/models.py:180
+#: contrib/comments/models.py:88
+#: contrib/comments/models.py:168
msgid "is public"
msgstr "es público"
@@ -1323,22 +1307,19 @@ msgid "is removed"
msgstr "está eliminado"
#: contrib/comments/models.py:90
-msgid ""
-"Check this box if the comment is inappropriate. A \"This comment has been "
-"removed\" message will be displayed instead."
-msgstr ""
-"Marque esta opción si el comentario es inapropiado. En su lugar se mostrará "
-"el mensaje \"Este comentario ha sido eliminado\"."
+msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
+msgstr "Marque esta opción si el comentario es inapropiado. En su lugar se mostrará el mensaje \"Este comentario ha sido eliminado\"."
#: contrib/comments/models.py:96
msgid "comments"
msgstr "comentarios"
-#: contrib/comments/models.py:140 contrib/comments/models.py:222
+#: contrib/comments/models.py:128
+#: contrib/comments/models.py:199
msgid "Content object"
msgstr "Objeto contenido"
-#: contrib/comments/models.py:168
+#: contrib/comments/models.py:156
#, python-format
msgid ""
"Posted by %(user)s at %(date)s\n"
@@ -1353,48 +1334,48 @@ msgstr ""
"\n"
"http://%(domain)s%(url)s"
-#: contrib/comments/models.py:178
+#: contrib/comments/models.py:166
msgid "person's name"
msgstr "nombre de la persona"
-#: contrib/comments/models.py:181
+#: contrib/comments/models.py:169
msgid "ip address"
msgstr "dirección ip"
-#: contrib/comments/models.py:183
+#: contrib/comments/models.py:171
msgid "approved by staff"
msgstr "aprobado por el staff"
-#: contrib/comments/models.py:187
+#: contrib/comments/models.py:175
msgid "free comment"
msgstr "comentario libre"
-#: contrib/comments/models.py:188
+#: contrib/comments/models.py:176
msgid "free comments"
msgstr "comentarios libres"
-#: contrib/comments/models.py:250
+#: contrib/comments/models.py:227
msgid "score"
msgstr "puntuación"
-#: contrib/comments/models.py:251
+#: contrib/comments/models.py:228
msgid "score date"
msgstr "fecha de la puntuación"
-#: contrib/comments/models.py:255
+#: contrib/comments/models.py:232
msgid "karma score"
msgstr "punto karma"
-#: contrib/comments/models.py:256
+#: contrib/comments/models.py:233
msgid "karma scores"
msgstr "puntos karma"
-#: contrib/comments/models.py:260
+#: contrib/comments/models.py:237
#, python-format
msgid "%(score)d rating by %(user)s"
msgstr "puntuado %(score)d por %(user)s"
-#: contrib/comments/models.py:277
+#: contrib/comments/models.py:254
#, python-format
msgid ""
"This comment was flagged by %(user)s:\n"
@@ -1405,36 +1386,36 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/models.py:285
+#: contrib/comments/models.py:262
msgid "flag date"
msgstr "fecha de la marca"
-#: contrib/comments/models.py:289
+#: contrib/comments/models.py:266
msgid "user flag"
msgstr "marca de usuario"
-#: contrib/comments/models.py:290
+#: contrib/comments/models.py:267
msgid "user flags"
msgstr "marcas de usuario"
-#: contrib/comments/models.py:294
+#: contrib/comments/models.py:271
#, python-format
msgid "Flag by %r"
msgstr "Marca de %r"
-#: contrib/comments/models.py:300
+#: contrib/comments/models.py:277
msgid "deletion date"
msgstr "fecha de eliminación"
-#: contrib/comments/models.py:303
+#: contrib/comments/models.py:280
msgid "moderator deletion"
msgstr "eliminación del moderador"
-#: contrib/comments/models.py:304
+#: contrib/comments/models.py:281
msgid "moderator deletions"
msgstr "eliminaciones del moderador"
-#: contrib/comments/models.py:308
+#: contrib/comments/models.py:285
#, python-format
msgid "Moderator deletion by %r"
msgstr "Eliminación del moderador %r"
@@ -1475,35 +1456,30 @@ msgstr "Previsualizar comentario"
msgid "Your name:"
msgstr "Su nombre:"
-#: contrib/comments/views/comments.py:28
-msgid ""
-"This rating is required because you've entered at least one other rating."
+#: contrib/comments/views/comments.py:76
+msgid "This rating is required because you've entered at least one other rating."
msgstr "Se precisa esta puntuación porque ha introducido al menos otra más."
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:160
#, python-format
msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comment:\n"
+"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
"\n"
"%(text)s"
msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comments:\n"
+"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
"\n"
"%(text)s"
msgstr[0] ""
-"Este comentario lo envió un usuario que ha enviado menos de %(count)s "
-"comentario:\n"
+"Este comentario lo envió un usuario que ha enviado menos de %(count)s comentario:\n"
"\n"
"%(text)s"
msgstr[1] ""
-"Este comentario lo envió un usuario que ha enviado menos de %(count)s "
-"comentarios:\n"
+"Este comentario lo envió un usuario que ha enviado menos de %(count)s comentarios:\n"
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:117
+#: contrib/comments/views/comments.py:165
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -1514,33 +1490,28 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:190
-#: contrib/comments/views/comments.py:283
+#: contrib/comments/views/comments.py:238
+#: contrib/comments/views/comments.py:331
msgid "Only POSTs are allowed"
msgstr "Sólo se admiten POSTs"
-#: contrib/comments/views/comments.py:194
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:242
+#: contrib/comments/views/comments.py:335
msgid "One or more of the required fields wasn't submitted"
msgstr "No se proporcionó uno o más de los siguientes campos requeridos"
-#: contrib/comments/views/comments.py:198
-#: contrib/comments/views/comments.py:289
+#: contrib/comments/views/comments.py:246
+#: contrib/comments/views/comments.py:337
msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
-"Alguien manipuló el formulario de comentarios (violación de seguridad)"
+msgstr "Alguien manipuló el formulario de comentarios (violación de seguridad)"
-#: contrib/comments/views/comments.py:208
-#: contrib/comments/views/comments.py:295
-msgid ""
-"The comment form had an invalid 'target' parameter -- the object ID was "
-"invalid"
-msgstr ""
-"El formulario de comentarios tiene un parámetro 'target' no válido (el ID de "
-"objeto era inválido)"
+#: contrib/comments/views/comments.py:256
+#: contrib/comments/views/comments.py:343
+msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
+msgstr "El formulario de comentarios tiene un parámetro 'target' no válido (el ID de objeto era inválido)"
-#: contrib/comments/views/comments.py:259
-#: contrib/comments/views/comments.py:324
+#: contrib/comments/views/comments.py:307
+#: contrib/comments/views/comments.py:372
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr "El formulario de comentario no proporcionó 'previsualizar' ni 'enviar'"
@@ -1568,12 +1539,13 @@ msgstr "tipo de contenido"
msgid "content types"
msgstr "tipos de contenido"
+#: contrib/flatpages/admin.py:9
+msgid "Advanced options"
+msgstr "Opciones avanzadas"
+
#: contrib/flatpages/models.py:9
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Ejemplo: '/about/contact/'. Asegúrese de que pone barras al principio y al "
-"final."
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "Ejemplo: '/about/contact/'. Asegúrese de que pone barras al principio y al final."
#: contrib/flatpages/models.py:10
msgid "title"
@@ -1592,12 +1564,8 @@ msgid "template name"
msgstr "nombre de plantilla"
#: contrib/flatpages/models.py:14
-msgid ""
-"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
-"will use 'flatpages/default.html'."
-msgstr ""
-"Ejemplo: 'flatpages/contact_page.html'. Si no es proporcionado, el sistema "
-"usará 'flatpages/default.html'."
+msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."
+msgstr "Ejemplo: 'flatpages/contact_page.html'. Si no es proporcionado, el sistema usará 'flatpages/default.html'."
#: contrib/flatpages/models.py:15
msgid "registration required"
@@ -1615,10 +1583,6 @@ msgstr "página estática"
msgid "flat pages"
msgstr "páginas estáticas"
-#: contrib/flatpages/models.py:27
-msgid "Advanced options"
-msgstr "Opciones avanzadas"
-
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "º"
@@ -1708,8 +1672,10 @@ msgstr "ayer"
msgid "Enter a postal code in the format NNNN or ANNNNAAA."
msgstr "Introduzca un código postal en el formato NNNN or ANNNNAAA."
-#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96
-#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23
+#: contrib/localflavor/ar/forms.py:49
+#: contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/br/forms.py:135
+#: contrib/localflavor/pe/forms.py:23
#: contrib/localflavor/pe/forms.py:51
msgid "This field requires only numbers."
msgstr "Este campo sólo acepta números."
@@ -1739,12 +1705,8 @@ msgid "Phone numbers must be in XX-XXXX-XXXX format."
msgstr "Los números de teléfono deben tener el formato XXX-XXX-XXXX."
#: contrib/localflavor/br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Seleccione un estado brasileño válido. Este estado no es uno de los estados "
-"disponibles."
+msgid "Select a valid brazilian state. That state is not one of the available states."
+msgstr "Seleccione un estado brasileño válido. Este estado no es uno de los estados disponibles."
#: contrib/localflavor/br/forms.py:94
msgid "Invalid CPF number."
@@ -1768,9 +1730,7 @@ msgstr "Introduzca un código postal en el formato XXX XXX."
#: contrib/localflavor/ca/forms.py:88
msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Introduzca un Número del Seguro Social de Canadá válido en el formato XXX-"
-"XXX-XXX."
+msgstr "Introduzca un Número del Seguro Social de Canadá válido en el formato XXX-XXX-XXX."
#: contrib/localflavor/ch/ch_states.py:5
msgid "Aargau"
@@ -1876,17 +1836,14 @@ msgstr "Zug"
msgid "Zurich"
msgstr "Zurich"
-#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12
+#: contrib/localflavor/ch/forms.py:16
+#: contrib/localflavor/no/forms.py:12
msgid "Enter a zip code in the format XXXX."
msgstr "Introduzca un código postal en el formato XXXX."
#: contrib/localflavor/ch/forms.py:64
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Introduzca un número de identificación o pasaporte suizos válidos en el "
-"formato X1234567<0 o 1234567890."
+msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
+msgstr "Introduzca un número de identificación o pasaporte suizos válidos en el formato X1234567<0 o 1234567890."
#: contrib/localflavor/cl/forms.py:29
msgid "Enter a valid Chilean RUT."
@@ -1902,80 +1859,77 @@ msgstr "El RUT chileno no es válido."
#: contrib/localflavor/de/de_states.py:5
msgid "Baden-Wuerttemberg"
-msgstr ""
+msgstr "Baden-Wuerttemberg"
#: contrib/localflavor/de/de_states.py:6
msgid "Bavaria"
-msgstr ""
+msgstr "Bavaria"
#: contrib/localflavor/de/de_states.py:7
msgid "Berlin"
-msgstr ""
+msgstr "Berlín"
#: contrib/localflavor/de/de_states.py:8
msgid "Brandenburg"
-msgstr ""
+msgstr "Brandenburg"
#: contrib/localflavor/de/de_states.py:9
msgid "Bremen"
-msgstr ""
+msgstr "Bremen"
#: contrib/localflavor/de/de_states.py:10
msgid "Hamburg"
-msgstr ""
+msgstr "Hamburgo"
#: contrib/localflavor/de/de_states.py:11
msgid "Hessen"
-msgstr ""
+msgstr "Hessen"
#: contrib/localflavor/de/de_states.py:12
msgid "Mecklenburg-Western Pomerania"
-msgstr ""
+msgstr "Mecklenburg-Western Pomerania"
#: contrib/localflavor/de/de_states.py:13
msgid "Lower Saxony"
-msgstr ""
+msgstr "Lower Saxony"
#: contrib/localflavor/de/de_states.py:14
msgid "North Rhine-Westphalia"
-msgstr ""
+msgstr "North Rhine-Westphalia"
#: contrib/localflavor/de/de_states.py:15
msgid "Rhineland-Palatinate"
-msgstr ""
+msgstr "Rhineland-Palatinate"
#: contrib/localflavor/de/de_states.py:16
msgid "Saarland"
-msgstr ""
+msgstr "Saarland"
#: contrib/localflavor/de/de_states.py:17
msgid "Saxony"
-msgstr ""
+msgstr "Saxony"
#: contrib/localflavor/de/de_states.py:18
msgid "Saxony-Anhalt"
-msgstr ""
+msgstr "Saxony-Anhalt"
#: contrib/localflavor/de/de_states.py:19
msgid "Schleswig-Holstein"
-msgstr ""
+msgstr "Schleswig-Holstein"
#: contrib/localflavor/de/de_states.py:20
msgid "Thuringia"
-msgstr ""
+msgstr "Thuringia"
-#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
+#: 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 "Introduzca un código postal en el formato XXXXX."
#: contrib/localflavor/de/forms.py:41
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Introduzca un número de tarjeta de identidad de Alemania válida en el "
-"formato XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
+msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format."
+msgstr "Introduzca un número de tarjeta de identidad de Alemania válida en el formato XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
#: contrib/localflavor/es/es_provinces.py:5
msgid "Arava"
@@ -2249,12 +2203,8 @@ msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
msgstr "Introduzca un código postal en el rango y formato 01XXX - 52XXX."
#: contrib/localflavor/es/forms.py:39
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Introduzca un número de teléfono válido en el formato 6XXXXXXXX, 8XXXXXXXX "
-"o 9XXXXXXXX."
+msgid "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX."
+msgstr "Introduzca un número de teléfono válido en el formato 6XXXXXXXX, 8XXXXXXXX o 9XXXXXXXX."
#: contrib/localflavor/es/forms.py:66
msgid "Please enter a valid NIF, NIE, or CIF."
@@ -2277,11 +2227,8 @@ msgid "Invalid checksum for CIF."
msgstr "El CIF es incorrecto."
#: contrib/localflavor/es/forms.py:142
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Introduzca un número de cuenta bancaria en el formato XXXX-XXXX-XX-"
-"XXXXXXXXXX."
+msgid "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
+msgstr "Introduzca un número de cuenta bancaria en el formato XXXX-XXXX-XX-XXXXXXXXXX."
#: contrib/localflavor/es/forms.py:143
msgid "Invalid checksum for bank account number."
@@ -2296,11 +2243,8 @@ msgid "Enter a zip code in the format XXXXXXX."
msgstr "Introduzca un código postal en el formato XXXXXXX."
#: contrib/localflavor/is_/forms.py:17
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Introduzca un número de identificación de Islandia válido. El formato es "
-"XXXXXX-XXXX."
+msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
+msgstr "Introduzca un número de identificación de Islandia válido. El formato es XXXXXX-XXXX."
#: contrib/localflavor/is_/forms.py:18
msgid "The Icelandic identification number is not valid."
@@ -2719,11 +2663,8 @@ msgid "Wrong checksum for the National Identification Number."
msgstr "El Número de Identificación Nacional es incorrecto."
#: contrib/localflavor/pl/forms.py:72
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
-msgstr ""
-"Introduzca un número de impuesto (NIP) en el formato XXX-XXX-XX-XX o XX-XX-"
-"XXX-XXX."
+msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
+msgstr "Introduzca un número de impuesto (NIP) en el formato XXX-XXX-XX-XX o XX-XX-XXX-XXX."
#: contrib/localflavor/pl/forms.py:73
msgid "Wrong checksum for the Tax Number (NIP)."
@@ -2731,8 +2672,7 @@ msgstr "El Número de Identificación Tributaria (NIP) es incorrecto."
#: contrib/localflavor/pl/forms.py:112
msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
-msgstr ""
-"El Número Nacional de Registro de Negocios (REGON) consiste en 7 o 9 dígitos."
+msgstr "El Número Nacional de Registro de Negocios (REGON) consiste en 7 o 9 dígitos."
#: contrib/localflavor/pl/forms.py:113
msgid "Wrong checksum for the National Business Register Number (REGON)."
@@ -2806,6 +2746,26 @@ msgstr "Greater Poland"
msgid "West Pomerania"
msgstr "West Pomerania"
+#: contrib/localflavor/ro/forms.py:19
+msgid "Enter a valid CIF."
+msgstr "Introduzca un CIF válido."
+
+#: contrib/localflavor/ro/forms.py:56
+msgid "Enter a valid CNP."
+msgstr "Introduzca un CNP válido."
+
+#: contrib/localflavor/ro/forms.py:141
+msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
+msgstr "Introduzca un IBAN válido en el formato ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
+
+#: contrib/localflavor/ro/forms.py:171
+msgid "Phone numbers must be in XXXX-XXXXXX format."
+msgstr "Los números de teléfono deben tener el formato XXXX-XXXXXX."
+
+#: contrib/localflavor/ro/forms.py:194
+msgid "Enter a valid postal code in the format XXXXXX"
+msgstr "Introduzca un código postal válido en el formato XXXXXX"
+
#: contrib/localflavor/sk/forms.py:30
msgid "Enter a postal code in the format XXXXX or XXX XX."
msgstr "Introduzca un código postal en el formato XXXXX o XXX XX."
@@ -3164,267 +3124,267 @@ msgstr "Introduzca un código postal válido."
#: contrib/localflavor/uk/uk_regions.py:11
msgid "Bedfordshire"
-msgstr ""
+msgstr "Bedfordshire"
#: contrib/localflavor/uk/uk_regions.py:12
msgid "Buckinghamshire"
-msgstr ""
+msgstr "Buckinghamshire"
#: contrib/localflavor/uk/uk_regions.py:14
msgid "Cheshire"
-msgstr ""
+msgstr "Cheshire"
#: contrib/localflavor/uk/uk_regions.py:15
msgid "Cornwall and Isles of Scilly"
-msgstr ""
+msgstr "Cornwall and Isles of Scilly"
#: contrib/localflavor/uk/uk_regions.py:16
msgid "Cumbria"
-msgstr ""
+msgstr "Cumbria"
#: contrib/localflavor/uk/uk_regions.py:17
msgid "Derbyshire"
-msgstr ""
+msgstr "Derbyshire"
#: contrib/localflavor/uk/uk_regions.py:18
msgid "Devon"
-msgstr ""
+msgstr "Devon"
#: contrib/localflavor/uk/uk_regions.py:19
msgid "Dorset"
-msgstr ""
+msgstr "Dorset"
#: contrib/localflavor/uk/uk_regions.py:20
msgid "Durham"
-msgstr ""
+msgstr "Durham"
#: contrib/localflavor/uk/uk_regions.py:21
msgid "East Sussex"
-msgstr ""
+msgstr "East Sussex"
#: contrib/localflavor/uk/uk_regions.py:22
msgid "Essex"
-msgstr ""
+msgstr "Essex"
#: contrib/localflavor/uk/uk_regions.py:23
msgid "Gloucestershire"
-msgstr ""
+msgstr "Gloucestershire"
#: contrib/localflavor/uk/uk_regions.py:24
msgid "Greater London"
-msgstr ""
+msgstr "Londres (área metropolitana)"
#: contrib/localflavor/uk/uk_regions.py:25
msgid "Greater Manchester"
-msgstr ""
+msgstr "Manchester (área metropolitana)"
#: contrib/localflavor/uk/uk_regions.py:26
msgid "Hampshire"
-msgstr ""
+msgstr "Hampshire"
#: contrib/localflavor/uk/uk_regions.py:27
msgid "Hertfordshire"
-msgstr ""
+msgstr "Hertfordshire"
#: contrib/localflavor/uk/uk_regions.py:28
msgid "Kent"
-msgstr ""
+msgstr "Kent"
#: contrib/localflavor/uk/uk_regions.py:29
msgid "Lancashire"
-msgstr ""
+msgstr "Lancashire"
#: contrib/localflavor/uk/uk_regions.py:30
msgid "Leicestershire"
-msgstr ""
+msgstr "Leicestershire"
#: contrib/localflavor/uk/uk_regions.py:31
msgid "Lincolnshire"
-msgstr ""
+msgstr "Lincolnshire"
#: contrib/localflavor/uk/uk_regions.py:32
msgid "Merseyside"
-msgstr ""
+msgstr "Merseyside"
#: contrib/localflavor/uk/uk_regions.py:33
msgid "Norfolk"
-msgstr ""
+msgstr "Norfolk"
#: contrib/localflavor/uk/uk_regions.py:34
msgid "North Yorkshire"
-msgstr ""
+msgstr "North Yorkshire"
#: contrib/localflavor/uk/uk_regions.py:35
msgid "Northamptonshire"
-msgstr ""
+msgstr "Northamptonshire"
#: contrib/localflavor/uk/uk_regions.py:36
msgid "Northumberland"
-msgstr ""
+msgstr "Northumberland"
#: contrib/localflavor/uk/uk_regions.py:37
msgid "Nottinghamshire"
-msgstr ""
+msgstr "Nottinghamshire"
#: contrib/localflavor/uk/uk_regions.py:38
msgid "Oxfordshire"
-msgstr ""
+msgstr "Oxfordshire"
#: contrib/localflavor/uk/uk_regions.py:39
msgid "Shropshire"
-msgstr ""
+msgstr "Shropshire"
#: contrib/localflavor/uk/uk_regions.py:40
msgid "Somerset"
-msgstr ""
+msgstr "Somerset"
#: contrib/localflavor/uk/uk_regions.py:41
msgid "South Yorkshire"
-msgstr ""
+msgstr "South Yorkshire"
#: contrib/localflavor/uk/uk_regions.py:42
msgid "Staffordshire"
-msgstr ""
+msgstr "Staffordshire"
#: contrib/localflavor/uk/uk_regions.py:43
msgid "Suffolk"
-msgstr ""
+msgstr "Suffolk"
#: contrib/localflavor/uk/uk_regions.py:44
msgid "Surrey"
-msgstr ""
+msgstr "Surrey"
#: contrib/localflavor/uk/uk_regions.py:45
msgid "Tyne and Wear"
-msgstr ""
+msgstr "Tyne and Wear"
#: contrib/localflavor/uk/uk_regions.py:46
msgid "Warwickshire"
-msgstr ""
+msgstr "Warwickshire"
#: contrib/localflavor/uk/uk_regions.py:47
msgid "West Midlands"
-msgstr ""
+msgstr "West Midlands"
#: contrib/localflavor/uk/uk_regions.py:48
msgid "West Sussex"
-msgstr ""
+msgstr "West Sussex"
#: contrib/localflavor/uk/uk_regions.py:49
msgid "West Yorkshire"
-msgstr ""
+msgstr "West Yorkshire"
#: contrib/localflavor/uk/uk_regions.py:50
msgid "Wiltshire"
-msgstr ""
+msgstr "Wiltshire"
#: contrib/localflavor/uk/uk_regions.py:51
msgid "Worcestershire"
-msgstr ""
+msgstr "Worcestershire"
#: contrib/localflavor/uk/uk_regions.py:55
msgid "County Antrim"
-msgstr ""
+msgstr "Condado de Antrim"
#: contrib/localflavor/uk/uk_regions.py:56
msgid "County Armagh"
-msgstr ""
+msgstr "Condado de Armagh"
#: contrib/localflavor/uk/uk_regions.py:57
msgid "County Down"
-msgstr ""
+msgstr "Condado de Down"
#: contrib/localflavor/uk/uk_regions.py:58
msgid "County Fermanagh"
-msgstr ""
+msgstr "Condado de Fermanagh"
#: contrib/localflavor/uk/uk_regions.py:59
msgid "County Londonderry"
-msgstr ""
+msgstr "Condado de Londonderry"
#: contrib/localflavor/uk/uk_regions.py:60
msgid "County Tyrone"
-msgstr ""
+msgstr "Condado de Tyrone"
#: contrib/localflavor/uk/uk_regions.py:64
msgid "Clwyd"
-msgstr ""
+msgstr "Clwyd"
#: contrib/localflavor/uk/uk_regions.py:65
msgid "Dyfed"
-msgstr ""
+msgstr "Dyfed"
#: contrib/localflavor/uk/uk_regions.py:66
msgid "Gwent"
-msgstr ""
+msgstr "Gwent"
#: contrib/localflavor/uk/uk_regions.py:67
msgid "Gwynedd"
-msgstr ""
+msgstr "Gwynedd"
#: contrib/localflavor/uk/uk_regions.py:68
msgid "Mid Glamorgan"
-msgstr ""
+msgstr "Mid Glamorgan"
#: contrib/localflavor/uk/uk_regions.py:69
msgid "Powys"
-msgstr ""
+msgstr "Powys"
#: contrib/localflavor/uk/uk_regions.py:70
msgid "South Glamorgan"
-msgstr ""
+msgstr "South Glamorgan"
#: contrib/localflavor/uk/uk_regions.py:71
msgid "West Glamorgan"
-msgstr ""
+msgstr "West Glamorgan"
#: contrib/localflavor/uk/uk_regions.py:75
msgid "Borders"
-msgstr ""
+msgstr "Borders"
#: contrib/localflavor/uk/uk_regions.py:76
msgid "Central Scotland"
-msgstr ""
+msgstr "Central Scotland"
#: contrib/localflavor/uk/uk_regions.py:77
msgid "Dumfries and Galloway"
-msgstr ""
+msgstr "Dumfries and Galloway"
#: contrib/localflavor/uk/uk_regions.py:78
msgid "Fife"
-msgstr ""
+msgstr "Fife"
#: contrib/localflavor/uk/uk_regions.py:79
msgid "Grampian"
-msgstr ""
+msgstr "Grampian"
#: contrib/localflavor/uk/uk_regions.py:80
msgid "Highland"
-msgstr ""
+msgstr "Highland"
#: contrib/localflavor/uk/uk_regions.py:81
msgid "Lothian"
-msgstr ""
+msgstr "Lothian"
#: contrib/localflavor/uk/uk_regions.py:82
msgid "Orkney Islands"
-msgstr ""
+msgstr "Orkney Islands"
#: contrib/localflavor/uk/uk_regions.py:83
msgid "Shetland Islands"
-msgstr ""
+msgstr "Shetland Islands"
#: contrib/localflavor/uk/uk_regions.py:84
msgid "Strathclyde"
-msgstr ""
+msgstr "Strathclyde"
#: contrib/localflavor/uk/uk_regions.py:85
msgid "Tayside"
-msgstr ""
+msgstr "Tayside"
#: contrib/localflavor/uk/uk_regions.py:86
msgid "Western Isles"
-msgstr ""
+msgstr "Western Isles"
#: contrib/localflavor/uk/uk_regions.py:90
msgid "England"
@@ -3432,7 +3392,7 @@ msgstr "Inglaterra"
#: contrib/localflavor/uk/uk_regions.py:91
msgid "Northern Ireland"
-msgstr ""
+msgstr "Irlanda del Norte"
#: contrib/localflavor/uk/uk_regions.py:92
msgid "Scotland"
@@ -3448,8 +3408,7 @@ msgstr "Introduzca un código postal en el formato XXXXX o XXXX-XXXX."
#: contrib/localflavor/us/forms.py:54
msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Introduzca un Número Seguro Social de EEUU válido en el formato XXX-XX-XXXX"
+msgstr "Introduzca un Número Seguro Social de EEUU válido en el formato XXX-XX-XXXX"
#: contrib/localflavor/za/forms.py:20
msgid "Enter a valid South African ID number"
@@ -3461,63 +3420,55 @@ msgstr "Introduzca un código postal surafricano válido"
#: contrib/localflavor/za/za_provinces.py:4
msgid "Eastern Cape"
-msgstr ""
+msgstr "Eastern Cape"
#: contrib/localflavor/za/za_provinces.py:5
msgid "Free State"
-msgstr ""
+msgstr "Free State"
#: contrib/localflavor/za/za_provinces.py:6
msgid "Gauteng"
-msgstr ""
+msgstr "Gauteng"
#: contrib/localflavor/za/za_provinces.py:7
msgid "KwaZulu-Natal"
-msgstr ""
+msgstr "KwaZulu-Natal"
#: contrib/localflavor/za/za_provinces.py:8
msgid "Limpopo"
-msgstr ""
+msgstr "Limpopo"
#: contrib/localflavor/za/za_provinces.py:9
msgid "Mpumalanga"
-msgstr ""
+msgstr "Mpumalanga"
#: contrib/localflavor/za/za_provinces.py:10
msgid "Northern Cape"
-msgstr ""
+msgstr "Northern Cape"
#: contrib/localflavor/za/za_provinces.py:11
msgid "North West"
-msgstr ""
+msgstr "North West"
#: contrib/localflavor/za/za_provinces.py:12
msgid "Western Cape"
-msgstr ""
+msgstr "Western Cape"
#: contrib/redirects/models.py:7
msgid "redirect from"
msgstr "redirigir desde"
#: contrib/redirects/models.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Esta ruta debería ser absoluta, excluyendo el nombre de dominio. Ejemplo: '/"
-"events/search/'."
+msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
+msgstr "Esta ruta debería ser absoluta, excluyendo el nombre de dominio. Ejemplo: '/events/search/'."
#: contrib/redirects/models.py:9
msgid "redirect to"
msgstr "redirigir a"
#: contrib/redirects/models.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Esto puede ser bien una ruta absoluta (como antes) o una URL completa que "
-"empiece con 'http://'."
+msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
+msgstr "Esto puede ser bien una ruta absoluta (como antes) o una URL completa que empiece con 'http://'."
#: contrib/redirects/models.py:13
msgid "redirect"
@@ -3527,23 +3478,23 @@ msgstr "redirección"
msgid "redirects"
msgstr "redirecciones"
-#: contrib/sessions/models.py:41
+#: contrib/sessions/models.py:45
msgid "session key"
msgstr "clave de sesión"
-#: contrib/sessions/models.py:42
+#: contrib/sessions/models.py:47
msgid "session data"
msgstr "datos de sesión"
-#: contrib/sessions/models.py:43
+#: contrib/sessions/models.py:48
msgid "expire date"
msgstr "fecha de caducidad"
-#: contrib/sessions/models.py:48
+#: contrib/sessions/models.py:53
msgid "session"
msgstr "sesión"
-#: contrib/sessions/models.py:49
+#: contrib/sessions/models.py:54
msgid "sessions"
msgstr "sesiones"
@@ -3555,24 +3506,17 @@ msgstr "nombre de dominio"
msgid "display name"
msgstr "nombre para mostrar"
-#: contrib/sites/models.py:37
+#: contrib/sites/models.py:38
msgid "site"
msgstr "sitio"
-#: contrib/sites/models.py:38
+#: contrib/sites/models.py:39
msgid "sites"
msgstr "sitios"
-#: core/validators.py:72
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Este valor debe contener sólo letras, números y guiones bajos."
-
#: core/validators.py:76
-msgid ""
-"This value must contain only letters, numbers, underscores, dashes or "
-"slashes."
-msgstr ""
-"Este valor debe contener sólo letras, números, guiones bajos y barras."
+msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
+msgstr "Este valor debe contener sólo letras, números, guiones bajos y barras."
#: core/validators.py:80
msgid "This value must contain only letters, numbers, underscores or hyphens."
@@ -3610,7 +3554,8 @@ msgstr "No se admiten caracteres no numéricos."
msgid "This value can't be comprised solely of digits."
msgstr "Este valor no puede comprender sólo dígitos."
-#: core/validators.py:128 newforms/fields.py:152
+#: core/validators.py:128
+#: forms/fields.py:157
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
@@ -3619,67 +3564,60 @@ msgid "Only alphabetical characters are allowed here."
msgstr "Sólo se admiten caracteres alfabéticos."
#: core/validators.py:147
-msgid "Year must be 1900 or later."
-msgstr "El año debe ser 1900 o posterior."
-
-#: core/validators.py:151
#, python-format
msgid "Invalid date: %s"
msgstr "Fecha no válida: %s"
-#: core/validators.py:156 db/models/fields/__init__.py:548
+#: core/validators.py:152
+#: db/models/fields/__init__.py:552
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Introduzca una fecha válida en formato AAAA-MM-DD."
-#: core/validators.py:161
+#: core/validators.py:157
msgid "Enter a valid time in HH:MM format."
msgstr "Introduzca una hora válida en formato HH:MM."
-#: core/validators.py:165 db/models/fields/__init__.py:625
+#: core/validators.py:161
+#: db/models/fields/__init__.py:633
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Introduzca una fecha/hora válida en formato AAAA-MM-DD HH:MM."
-#: core/validators.py:170 newforms/fields.py:403
+#: core/validators.py:166
+#: forms/fields.py:408
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida."
-#: core/validators.py:182 core/validators.py:474 newforms/fields.py:433
-#: oldforms/__init__.py:687
+#: core/validators.py:178
+#: core/validators.py:470
+#: forms/fields.py:426
msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-"No se ha enviado ningún fichero. Compruebe el tipo de codificación en el "
-"formulario."
+msgstr "No se ha enviado ningún fichero. Compruebe el tipo de codificación en el formulario."
-#: core/validators.py:193 newforms/fields.py:459
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-"Envíe una imagen válida. El fichero que ha enviado no era una imagen o se "
-"trataba de una imagen corrupta."
+#: core/validators.py:189
+#: forms/fields.py:466
+msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
+msgstr "Envíe una imagen válida. El fichero que ha enviado no era una imagen o se trataba de una imagen corrupta."
-#: core/validators.py:200
+#: core/validators.py:196
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "La URL %s no apunta a una imagen válida."
-#: core/validators.py:204
+#: core/validators.py:200
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr ""
-"Los números de teléfono deben guardar el formato XXX-XXX-XXXX. \"%s\" no es "
-"válido."
+msgstr "Los números de teléfono deben guardar el formato XXX-XXX-XXXX. \"%s\" no es válido."
-#: core/validators.py:212
+#: core/validators.py:208
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "La URL %s no apunta a un vídeo QuickTime válido."
-#: core/validators.py:216
+#: core/validators.py:212
msgid "A valid URL is required."
msgstr "Se precisa una URL válida."
-#: core/validators.py:230
+#: core/validators.py:226
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
@@ -3688,371 +3626,327 @@ msgstr ""
"Se precisa HTML válido. Los errores específicos son:\n"
"%s"
-#: core/validators.py:237
+#: core/validators.py:233
#, python-format
msgid "Badly formed XML: %s"
msgstr "XML mal formado: %s"
-#: core/validators.py:254
+#: core/validators.py:250
#, python-format
msgid "Invalid URL: %s"
msgstr "URL no válida: %s"
-#: core/validators.py:259 core/validators.py:261
+#: core/validators.py:255
+#: core/validators.py:257
#, python-format
msgid "The URL %s is a broken link."
msgstr "La URL %s es un enlace roto."
-#: core/validators.py:267
+#: core/validators.py:263
msgid "Enter a valid U.S. state abbreviation."
msgstr "Introduzca una abreviatura válida de estado de los EEUU."
-#: core/validators.py:281
+#: core/validators.py:277
#, 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] "¡Cuide su vocabulario! Aquí no admitimos la palabra %s."
msgstr[1] "¡Cuide su vocabulario! Aquí no admitimos las palabras %s."
-#: core/validators.py:288
+#: core/validators.py:284
#, python-format
msgid "This field must match the '%s' field."
msgstr "Este campo debe concordar con el campo '%s'."
-#: core/validators.py:307
+#: core/validators.py:303
msgid "Please enter something for at least one field."
msgstr "Por favor, introduzca algo en al menos un campo."
-#: core/validators.py:316 core/validators.py:327
+#: core/validators.py:312
+#: core/validators.py:323
msgid "Please enter both fields or leave them both empty."
msgstr "Por favor, rellene ambos campos o deje ambos vacíos."
-#: core/validators.py:335
+#: core/validators.py:331
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "Se debe proporcionar este campo si %(field)s es %(value)s"
-#: core/validators.py:348
+#: core/validators.py:344
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s"
-#: core/validators.py:367
+#: core/validators.py:363
msgid "Duplicate values are not allowed."
msgstr "No se admiten valores duplicados."
-#: core/validators.py:382
+#: core/validators.py:378
#, python-format
msgid "This value must be between %(lower)s and %(upper)s."
msgstr "Este valor debe estar entre %(lower)s y %(upper)s."
-#: core/validators.py:384
+#: core/validators.py:380
#, python-format
msgid "This value must be at least %s."
msgstr "Este valor debe ser como mínimo %s."
-#: core/validators.py:386
+#: core/validators.py:382
#, python-format
msgid "This value must be no more than %s."
msgstr "Este valor no debe ser mayor que %s."
-#: core/validators.py:427
+#: core/validators.py:423
#, python-format
msgid "This value must be a power of %s."
msgstr "Este valor debe ser una potencia de %s."
-#: core/validators.py:437
+#: core/validators.py:433
msgid "Please enter a valid decimal number."
msgstr "Por favor, introduzca un número decimal válido."
-#: core/validators.py:444
+#: core/validators.py:440
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s total digits."
-msgstr[0] ""
-"Por favor, introduzca un número decimal válido con a lo más %s dígito en "
-"total."
-msgstr[1] ""
-"Por favor, introduzca un número decimal válido con a lo más %s dígitos en "
-"total."
+msgid_plural "Please enter a valid decimal number with at most %s total digits."
+msgstr[0] "Por favor, introduzca un número decimal válido con a lo más %s dígito en total."
+msgstr[1] "Por favor, introduzca un número decimal válido con a lo más %s dígitos en total."
-#: core/validators.py:447
+#: core/validators.py:443
#, python-format
-msgid ""
-"Please enter a valid decimal number with a whole part of at most %s digit."
-msgid_plural ""
-"Please enter a valid decimal number with a whole part of at most %s digits."
-msgstr[0] ""
-"Por favor, introduzca un número decimal válido con a lo más %s dígito en su "
-"parte entera."
-msgstr[1] ""
-"Por favor, introduzca un número decimal válido con a lo más %s dígitos en su "
-"parte entera."
+msgid "Please enter a valid decimal number with a whole part of at most %s digit."
+msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
+msgstr[0] "Por favor, introduzca un número decimal válido con a lo más %s dígito en su parte entera."
+msgstr[1] "Por favor, introduzca un número decimal válido con a lo más %s dígitos en su parte entera."
-#: core/validators.py:450
+#: core/validators.py:446
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] ""
-"Por favor, introduzca un número decimal válido con a lo más %s dígito "
-"decimal."
-msgstr[1] ""
-"Por favor, introduzca un número decimal válido con a lo más %s dígitos "
-"decimales."
+msgid_plural "Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "Por favor, introduzca un número decimal válido con a lo más %s dígito decimal."
+msgstr[1] "Por favor, introduzca un número decimal válido con a lo más %s dígitos decimales."
-#: core/validators.py:458
+#: core/validators.py:454
msgid "Please enter a valid floating point number."
msgstr "Por favor, introduzca un número de coma flotante válido."
-#: core/validators.py:467
+#: core/validators.py:463
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "Asegúrese de que el fichero que envía tiene al menos %s bytes."
-#: core/validators.py:468
+#: core/validators.py:464
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "Asegúrese de que el fichero que envía tiene como máximo %s bytes."
-#: core/validators.py:485
+#: core/validators.py:481
msgid "The format for this field is wrong."
msgstr "El formato de este campo es incorrecto."
-#: core/validators.py:500
+#: core/validators.py:496
msgid "This field is invalid."
msgstr "Este campo no es válido."
-#: core/validators.py:536
+#: core/validators.py:532
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "No se pudo obtener nada de %s."
-#: core/validators.py:539
+#: core/validators.py:535
#, python-format
-msgid ""
-"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr ""
-"La URL %(url)s devolvió la cabecera Content-Type '%(contenttype)s', que no "
-"es válida."
+msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr "La URL %(url)s devolvió la cabecera Content-Type '%(contenttype)s', que no es válida."
-#: core/validators.py:572
+#: core/validators.py:568
#, python-format
-msgid ""
-"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
-"\"%(start)s\".)"
-msgstr ""
-"Por favor, cierre la etiqueta %(tag)s de la línea %(line)s. (La línea "
-"empieza por \"%(start)s\".)"
+msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
+msgstr "Por favor, cierre la etiqueta %(tag)s de la línea %(line)s. (La línea empieza por \"%(start)s\".)"
-#: core/validators.py:576
+#: core/validators.py:572
#, python-format
-msgid ""
-"Some text starting on line %(line)s is not allowed in that context. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"Parte del texto que comienza en la línea %(line)s no está permitido en ese "
-"contexto. (La línea empieza por \"%(start)s\".)"
+msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
+msgstr "Parte del texto que comienza en la línea %(line)s no está permitido en ese contexto. (La línea empieza por \"%(start)s\".)"
-#: core/validators.py:581
+#: core/validators.py:577
#, python-format
-msgid ""
-"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"El \"%(attr)s\" de la línea %(line)s no es un atributo válido. (La línea "
-"empieza por \"%(start)s\".)"
+msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
+msgstr "El \"%(attr)s\" de la línea %(line)s no es un atributo válido. (La línea empieza por \"%(start)s\".)"
-#: core/validators.py:586
+#: core/validators.py:582
#, python-format
-msgid ""
-"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"La \"<%(tag)s>\" de la línea %(line)s no es una etiqueta válida. (La línea "
-"empieza por \"%(start)s\".)"
+msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
+msgstr "La \"<%(tag)s>\" de la línea %(line)s no es una etiqueta válida. (La línea empieza por \"%(start)s\".)"
-#: core/validators.py:590
+#: core/validators.py:586
#, python-format
-msgid ""
-"A tag on line %(line)s is missing one or more required attributes. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"A una etiqueta de la línea %(line)s le faltan uno o más atributos "
-"requeridos. (La línea empieza por \"%(start)s\".)"
+msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
+msgstr "A una etiqueta de la línea %(line)s le faltan uno o más atributos requeridos. (La línea empieza por \"%(start)s\".)"
-#: core/validators.py:595
+#: core/validators.py:591
#, python-format
-msgid ""
-"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"El atributo \"%(attr)s\" de la línea %(line)s tiene un valor que no es "
-"válido. (La línea empieza por \"%(start)s\".)"
+msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
+msgstr "El atributo \"%(attr)s\" de la línea %(line)s tiene un valor que no es válido. (La línea empieza por \"%(start)s\".)"
-#: db/models/manipulators.py:308
+#: db/models/manipulators.py:304
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "%(object)s de este %(type)s ya existen en este %(field)s."
-#: db/models/fields/__init__.py:54
+#: db/models/fields/__init__.py:47
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "Ya existe %(optname)s con este %(fieldname)s."
-#: db/models/fields/__init__.py:179 db/models/fields/__init__.py:348
-#: db/models/fields/__init__.py:780 db/models/fields/__init__.py:791
-#: newforms/fields.py:46 oldforms/__init__.py:374
+#: db/models/fields/__init__.py:175
+#: db/models/fields/__init__.py:343
+#: db/models/fields/__init__.py:795
+#: db/models/fields/__init__.py:806
+#: forms/fields.py:51
+#: oldforms/__init__.py:374
msgid "This field is required."
msgstr "Este campo es obligatorio."
-#: db/models/fields/__init__.py:448
+#: db/models/fields/__init__.py:450
msgid "This value must be an integer."
msgstr "Este valor debe ser un entero."
-#: db/models/fields/__init__.py:487
+#: db/models/fields/__init__.py:491
msgid "This value must be either True or False."
msgstr "Este valor debe ser Verdadero o Falso."
-#: db/models/fields/__init__.py:511
+#: db/models/fields/__init__.py:515
msgid "This field cannot be null."
msgstr "Este campo no puede estar vacío."
-#: db/models/fields/__init__.py:689
+#: db/models/fields/__init__.py:702
msgid "This value must be a decimal number."
msgstr "Este valor debe ser un entero."
-#: db/models/fields/__init__.py:800
+#: db/models/fields/__init__.py:815
msgid "Enter a valid filename."
msgstr "Introduzca un nombre de fichero válido"
-#: db/models/fields/__init__.py:981
+#: db/models/fields/__init__.py:1006
msgid "This value must be either None, True or False."
msgstr "Este valor debe ser Verdadero, Falso o Ninguno."
-#: db/models/fields/related.py:94
+#: db/models/fields/related.py:93
#, python-format
msgid "Please enter a valid %s."
msgstr "Por favor, introduzca un %s válido."
-#: db/models/fields/related.py:746
-msgid "Separate multiple IDs with commas."
-msgstr "Separe múltiples IDs con comas."
-
-#: db/models/fields/related.py:748
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
-"Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar "
-"más de una opción."
+#: db/models/fields/related.py:729
+msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr "Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar más de una opción."
-#: db/models/fields/related.py:795
+#: db/models/fields/related.py:773
#, 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] ""
-"Por favor, introduzca IDs de %(self)s válidos. El valor %(value)r no es "
-"válido."
-msgstr[1] ""
-"Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son "
-"válidos."
+msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr[0] "Por favor, introduzca IDs de %(self)s válidos. El valor %(value)r no es válido."
+msgstr[1] "Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son válidos."
-#: newforms/fields.py:47
+#: forms/fields.py:52
msgid "Enter a valid value."
msgstr "Introduzca un valor correcto."
-#: newforms/fields.py:124
+#: forms/fields.py:129
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
-msgstr ""
-"Asegúrese de que su texto tiene a lo más %(max)d caracteres (actualmente "
-"tiene %(length)d)."
+msgstr "Asegúrese de que su texto tiene a lo más %(max)d caracteres (actualmente tiene %(length)d)."
-#: newforms/fields.py:125
+#: forms/fields.py:130
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
-msgstr ""
-"Asegúrese de que su texto tiene al menos %(min)d caracteres (actualmente "
-"tiene %(length)d)."
+msgstr "Asegúrese de que su texto tiene al menos %(min)d caracteres (actualmente tiene %(length)d)."
-#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211
+#: forms/fields.py:158
+#: forms/fields.py:187
+#: forms/fields.py:216
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Asegúrese de que este valor es menor o igual a %s."
-#: newforms/fields.py:154 newforms/fields.py:183 newforms/fields.py:212
+#: forms/fields.py:159
+#: forms/fields.py:188
+#: forms/fields.py:217
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Asegúrese de que este valor es mayor o igual a %s."
-#: newforms/fields.py:181 newforms/fields.py:210
+#: forms/fields.py:186
+#: forms/fields.py:215
msgid "Enter a number."
msgstr "Introduzca un número."
-#: newforms/fields.py:213
+#: forms/fields.py:218
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Asegúrese de que no hay más de %s dígitos en total."
-#: newforms/fields.py:214
+#: forms/fields.py:219
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Asegúrese de que no hay más de %s decimales."
-#: newforms/fields.py:215
+#: forms/fields.py:220
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Asegúrese de que no hay más de %s dígitos antes de la coma decimal."
-#: newforms/fields.py:263 newforms/fields.py:751
+#: forms/fields.py:268
+#: forms/fields.py:795
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
-#: newforms/fields.py:296 newforms/fields.py:752
+#: forms/fields.py:301
+#: forms/fields.py:796
msgid "Enter a valid time."
msgstr "Introduzca una hora válida."
-#: newforms/fields.py:335
+#: forms/fields.py:340
msgid "Enter a valid date/time."
msgstr "Introduzca una fecha/hora válida."
-#: newforms/fields.py:434
+#: forms/fields.py:427
msgid "No file was submitted."
msgstr "No se ha enviado ningún fichero"
-#: newforms/fields.py:435 oldforms/__init__.py:689
+#: forms/fields.py:428
+#: oldforms/__init__.py:693
msgid "The submitted file is empty."
msgstr "El fichero enviado está vacío."
-#: newforms/fields.py:497
+#: forms/fields.py:527
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
-#: newforms/fields.py:498
+#: forms/fields.py:528
msgid "This URL appears to be a broken link."
msgstr "La URL parece ser un enlace roto."
-#: newforms/fields.py:560 newforms/models.py:299
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Escoja una opción válida. Esa opción no está entre las disponibles."
-
-#: newforms/fields.py:599
+#: forms/fields.py:593
+#: forms/fields.py:644
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
-"Escoja una opción válida. %(value)s no es una de las opciones disponibles."
+msgstr "Escoja una opción válida. %(value)s no es una de las opciones disponibles."
-#: newforms/fields.py:600 newforms/fields.py:662 newforms/models.py:371
+#: forms/fields.py:645
+#: forms/fields.py:706
+#: forms/models.py:581
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
-#: newforms/fields.py:780
+#: forms/fields.py:824
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida."
-#: newforms/models.py:372
+#: forms/models.py:514
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Escoja una opción válida. Esa opción no está entre las disponibles."
+
+#: forms/models.py:582
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Escoja una opción válida; '%s' no es una de las opciones disponibles."
@@ -4068,20 +3962,22 @@ msgstr[1] "Asegúrese de que su texto tiene menos de %s caracteres."
msgid "Line breaks are not allowed here."
msgstr "No se permiten saltos de línea."
-#: oldforms/__init__.py:512 oldforms/__init__.py:586 oldforms/__init__.py:625
+#: oldforms/__init__.py:512
+#: oldforms/__init__.py:586
+#: oldforms/__init__.py:625
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Escoja una opción válida; '%(data)s' no está en %(choices)s."
-#: oldforms/__init__.py:745
+#: oldforms/__init__.py:754
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Introduzca un número entero entre -32.768 y 32.767."
-#: oldforms/__init__.py:755
+#: oldforms/__init__.py:764
msgid "Enter a positive number."
msgstr "Introduzca un número positivo."
-#: oldforms/__init__.py:765
+#: oldforms/__init__.py:774
msgid "Enter a whole number between 0 and 32,767."
msgstr "Introduzca un número entero entre 0 y 32.767."
@@ -4199,23 +4095,28 @@ msgstr "enero"
msgid "February"
msgstr "febrero"
-#: utils/dates.py:18 utils/dates.py:31
+#: utils/dates.py:18
+#: utils/dates.py:31
msgid "March"
msgstr "marzo"
-#: utils/dates.py:18 utils/dates.py:31
+#: utils/dates.py:18
+#: utils/dates.py:31
msgid "April"
msgstr "abril"
-#: utils/dates.py:18 utils/dates.py:31
+#: utils/dates.py:18
+#: utils/dates.py:31
msgid "May"
msgstr "mayo"
-#: utils/dates.py:18 utils/dates.py:31
+#: utils/dates.py:18
+#: utils/dates.py:31
msgid "June"
msgstr "junio"
-#: utils/dates.py:19 utils/dates.py:31
+#: utils/dates.py:19
+#: utils/dates.py:31
msgid "July"
msgstr "julio"
@@ -4315,7 +4216,7 @@ msgstr "nov."
msgid "Dec."
msgstr "dic."
-#: utils/text.py:127
+#: utils/text.py:128
msgid "or"
msgstr "o"
@@ -4369,38 +4270,53 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:403
+#: utils/translation/trans_real.py:401
msgid "DATE_FORMAT"
msgstr "j N Y"
-#: utils/translation/trans_real.py:404
+#: utils/translation/trans_real.py:402
msgid "DATETIME_FORMAT"
msgstr "j N Y P"
-#: utils/translation/trans_real.py:405
+#: utils/translation/trans_real.py:403
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:421
+#: utils/translation/trans_real.py:419
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:422
+#: utils/translation/trans_real.py:420
msgid "MONTH_DAY_FORMAT"
msgstr "j \\de F"
-#: views/generic/create_update.py:43
+#: views/generic/create_update.py:129
#, python-format
msgid "The %(verbose_name)s was created successfully."
-msgstr "El %(verbose_name)s se ha creado exitosamente."
+msgstr "El/La %(verbose_name)s se ha creado exitosamente."
-#: views/generic/create_update.py:117
+#: views/generic/create_update.py:172
#, python-format
msgid "The %(verbose_name)s was updated successfully."
msgstr "Se actualizó con éxito el %(verbose_name)s."
-#: views/generic/create_update.py:184
+#: views/generic/create_update.py:214
#, python-format
msgid "The %(verbose_name)s was deleted."
-msgstr "El %(verbose_name)s ha sido borrado."
+msgstr "El/La %(verbose_name)s ha sido borrado."
+
+#~ msgid "Ordering"
+#~ msgstr "Ordenación"
+#~ msgid "Order:"
+#~ msgstr "Orden:"
+#~ msgid "Added %s."
+#~ msgstr "Añadido %s."
+#~ msgid "Deleted %s."
+#~ msgstr "Borrado %s."
+#~ msgid "The two 'new password' fields didn't match."
+#~ msgstr "Los dos campos 'nueva contraseña' no coinciden."
+#~ msgid "Year must be 1900 or later."
+#~ msgstr "El año debe ser 1900 o posterior."
+#~ msgid "Separate multiple IDs with commas."
+#~ msgstr "Separe múltiples IDs con comas."
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
index e66de9a8e3..ca1ea679ae 100644
Binary files a/django/conf/locale/es_AR/LC_MESSAGES/django.mo and b/django/conf/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.po b/django/conf/locale/es_AR/LC_MESSAGES/django.po
index 40f2b5a114..fa26d5f6d7 100644
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-01 13:16-0200\n"
-"PO-Revision-Date: 2008-02-02 14:26-0200\n"
+"POT-Creation-Date: 2008-07-19 13:34-0300\n"
+"PO-Revision-Date: 2008-07-19 19:37-0300\n"
"Last-Translator: Ramiro Morales \n"
"Language-Team: Django-I18N \n"
"MIME-Version: 1.0\n"
@@ -15,185 +15,201 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:44
msgid "Arabic"
-msgstr "Árabe"
+msgstr "árabe"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:45
msgid "Bengali"
-msgstr "Bengalí"
+msgstr "bengalí"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:46
msgid "Bulgarian"
-msgstr "Búlgaro"
+msgstr "búlgaro"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:47
msgid "Catalan"
-msgstr "Catalán"
+msgstr "catalán"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:48
msgid "Czech"
-msgstr "Checo"
+msgstr "checo"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:49
msgid "Welsh"
-msgstr "Galés"
+msgstr "galés"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:50
msgid "Danish"
-msgstr "Danés"
+msgstr "danés"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:51
msgid "German"
-msgstr "Alemán"
+msgstr "alemán"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:52
msgid "Greek"
-msgstr "Griego"
+msgstr "griego"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
msgid "English"
-msgstr "Inglés"
+msgstr "inglés"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:54
msgid "Spanish"
-msgstr "Español"
+msgstr "español"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:55
+msgid "Estonian"
+msgstr "estonio"
+
+#: conf/global_settings.py:56
msgid "Argentinean Spanish"
-msgstr "Español Argentino"
+msgstr "español de Argentina"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:57
+msgid "Basque"
+msgstr "vasco"
+
+#: conf/global_settings.py:58
msgid "Persian"
-msgstr "Persa"
+msgstr "persa"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:59
msgid "Finnish"
-msgstr "Finlandés"
+msgstr "finlandés"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:60
msgid "French"
-msgstr "Francés"
+msgstr "francés"
-#: conf/global_settings.py:54
-msgid "Gaeilge"
-msgstr "Irlandés"
+#: conf/global_settings.py:61
+msgid "Irish"
+msgstr "irlandés"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:62
msgid "Galician"
-msgstr "Gallego"
+msgstr "gallego"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:63
msgid "Hungarian"
-msgstr "Húngaro"
+msgstr "húngaro"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:64
msgid "Hebrew"
-msgstr "Hebreo"
+msgstr "hebreo"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:65
msgid "Croatian"
-msgstr "Croata"
+msgstr "croata"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:66
msgid "Icelandic"
-msgstr "Islandés"
+msgstr "islandés"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:67
msgid "Italian"
-msgstr "Italiano"
+msgstr "italiano"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:68
msgid "Japanese"
-msgstr "Japonés"
+msgstr "japonés"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:69
+msgid "Georgian"
+msgstr "georgiano"
+
+#: conf/global_settings.py:70
msgid "Korean"
-msgstr "Koreano"
+msgstr "koreano"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:71
msgid "Khmer"
-msgstr "Jémer"
+msgstr "jémer"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:72
msgid "Kannada"
-msgstr "Canarés"
+msgstr "canarés"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:73
msgid "Latvian"
-msgstr "Letón"
+msgstr "letón"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:74
+msgid "Lithuanian"
+msgstr "lituano"
+
+#: conf/global_settings.py:75
msgid "Macedonian"
-msgstr "Macedonio"
+msgstr "macedonio"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:76
msgid "Dutch"
-msgstr "Holandés"
+msgstr "holandés"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:77
msgid "Norwegian"
-msgstr "Noruego"
+msgstr "noruego"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:78
msgid "Polish"
-msgstr "Polaco"
+msgstr "polaco"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:79
msgid "Portugese"
-msgstr "Portugués"
+msgstr "portugués"
-#: conf/global_settings.py:71
-msgid "Brazilian"
-msgstr "Brasileño"
+#: conf/global_settings.py:80
+msgid "Brazilian Portuguese"
+msgstr "portugués de Brasil"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:81
msgid "Romanian"
-msgstr "Rumano"
+msgstr "rumano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:82
msgid "Russian"
-msgstr "Ruso"
+msgstr "ruso"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:83
msgid "Slovak"
-msgstr "Eslovaco"
+msgstr "eslovaco"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:84
msgid "Slovenian"
-msgstr "Esloveno"
+msgstr "esloveno"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:85
msgid "Serbian"
-msgstr "Serbio"
+msgstr "serbio"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:86
msgid "Swedish"
-msgstr "Sueco"
+msgstr "sueco"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:87
msgid "Tamil"
-msgstr "Tamil"
+msgstr "tamil"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:88
msgid "Telugu"
-msgstr "Telugu"
+msgstr "telugu"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:89
msgid "Turkish"
-msgstr "Turco"
+msgstr "turco"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:90
msgid "Ukrainian"
-msgstr "Ucraniano"
+msgstr "ucraniano"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:91
msgid "Simplified Chinese"
-msgstr "Chino simplificado"
+msgstr "chino simplificado"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:92
msgid "Traditional Chinese"
-msgstr "Chino tradicional"
+msgstr "chino tradicional"
#: contrib/admin/filterspecs.py:44
#, python-format
@@ -229,49 +245,209 @@ msgstr "Este mes"
msgid "This year"
msgstr "Este año"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Yes"
msgstr "Sí"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "No"
msgstr "No"
-#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Unknown"
msgstr "Desconocido"
-#: contrib/admin/models.py:18
+#: contrib/admin/models.py:19
msgid "action time"
msgstr "hora de acción"
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
msgid "object id"
msgstr "id de objeto"
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
msgid "object repr"
msgstr "repr de objeto"
-#: contrib/admin/models.py:23
+#: contrib/admin/models.py:24
msgid "action flag"
msgstr "marca de acción"
-#: contrib/admin/models.py:24
+#: contrib/admin/models.py:25
msgid "change message"
msgstr "mensaje de cambio"
-#: contrib/admin/models.py:27
+#: contrib/admin/models.py:28
msgid "log entry"
msgstr "entrada de registro"
-#: contrib/admin/models.py:28
+#: contrib/admin/models.py:29
msgid "log entries"
msgstr "entradas de registro"
+#: contrib/admin/options.py:162 contrib/admin/options.py:181
+msgid "None"
+msgstr "Ninguno"
+
+#: contrib/admin/options.py:348 contrib/auth/admin.py:37
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Se agregó con éxito %(name)s \"%(obj)s\"."
+
+#: contrib/admin/options.py:352 contrib/admin/options.py:420
+#: contrib/auth/admin.py:42
+msgid "You may edit it again below."
+msgstr "Puede modificarlo nuevamente abajo."
+
+#: contrib/admin/options.py:362 contrib/admin/options.py:429
+#, python-format
+msgid "You may add another %s below."
+msgstr "Puede agregar otro %s abajo."
+
+#: contrib/admin/options.py:396
+#, python-format
+msgid "Changed %s."
+msgstr "Modifica %s."
+
+#: contrib/admin/options.py:396 contrib/admin/options.py:406
+#: core/validators.py:279 db/models/manipulators.py:305
+msgid "and"
+msgstr "y"
+
+#: contrib/admin/options.py:401
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "Se agregó %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:405
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "Se modificaron %(list)s en %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:410
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "Se eliminó %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:415
+msgid "No fields changed."
+msgstr "No ha modificado ningún campo."
+
+#: contrib/admin/options.py:418
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Se modificó con éxito %(name)s \"%(obj)s\"."
+
+#: contrib/admin/options.py:426
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo nuevamente abajo."
+
+#: contrib/admin/options.py:507
+#, python-format
+msgid "Add %s"
+msgstr "Agregar %s"
+
+#: contrib/admin/options.py:570
+#, python-format
+msgid "Change %s"
+msgstr "Modificar %s"
+
+#: contrib/admin/options.py:600
+msgid "Database error"
+msgstr "Error de base de datos"
+
+#: contrib/admin/options.py:649
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"."
+
+#: contrib/admin/options.py:655
+msgid "Are you sure?"
+msgstr "¿Está seguro?"
+
+#: contrib/admin/options.py:682
+#, python-format
+msgid "Change history: %s"
+msgstr "Historia de modificaciones: %s"
+
+#: contrib/admin/sites.py:17 contrib/admin/views/decorators.py:16
+#: contrib/auth/forms.py:71 contrib/comments/views/comments.py:56
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Por favor introduzca un nombre de usuario y una contraseña correctos. Note "
+"que ambos campos son sensibles a mayúsculas/minúsculas."
+
+#: contrib/admin/sites.py:218 contrib/admin/views/decorators.py:68
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Por favor, identifíquese de nuevo porque su sesión ha caducado. No se "
+"preocupe: se ha guardado su envío."
+
+#: contrib/admin/sites.py:225 contrib/admin/views/decorators.py:75
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Parece que su navegador no está configurado para aceptar cookies. Por favor "
+"actívelas, recargue esta página, e inténtelo de nuevo."
+
+#: contrib/admin/sites.py:239 contrib/admin/sites.py:245
+#: contrib/admin/views/decorators.py:92
+msgid "Usernames cannot contain the '@' character."
+msgstr "Los nombres de usuario no pueden contener el carácter '@'."
+
+#: contrib/admin/sites.py:242 contrib/admin/views/decorators.py:88
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+"Su dirección de correo electrónico no es su nombre de usuario. Intente "
+"nuevamente usando '%s'."
+
+#: contrib/admin/sites.py:313
+msgid "Site administration"
+msgstr "Administración de sitio"
+
+#: contrib/admin/sites.py:335 contrib/admin/templates/admin/login.html:27
+#: contrib/admin/views/decorators.py:30
+msgid "Log in"
+msgstr "Identificarse"
+
+#: contrib/admin/util.py:126
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Uno o más %(fieldname)s en %(name)s: %(obj)s"
+
+#: contrib/admin/util.py:131
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Uno o más %(fieldname)s en %(name)s:"
+
+#: contrib/admin/widgets.py:66
+msgid "Date:"
+msgstr "Fecha:"
+
+#: contrib/admin/widgets.py:66
+msgid "Time:"
+msgstr "Hora:"
+
+#: contrib/admin/widgets.py:90
+msgid "Currently:"
+msgstr "Actualmente"
+
+#: contrib/admin/widgets.py:90
+msgid "Change:"
+msgstr "Modificar:"
+
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
msgid "Page not found"
@@ -282,17 +458,17 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Lo sentimos, pero no se encuentra la página solicitada."
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:37
-#: contrib/admin/templates/admin/change_form.html:12
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:4
-#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
msgid "Home"
@@ -319,22 +495,28 @@ msgstr ""
"mediante correo electrónico y debería ser solucionado en breve. Gracias por "
"su paciencia."
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:25
msgid "Welcome,"
msgstr "Bienvenido,"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:25
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Documentation"
msgstr "Documentación"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:45
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:13
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Change password"
msgstr "Cambiar contraseña"
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/comments/templates/comments/form.html:6
msgid "Log out"
msgstr "Cerrar sesión"
@@ -347,46 +529,43 @@ msgstr "Sitio de administración de Django"
msgid "Django administration"
msgstr "Administración de Django"
-#: contrib/admin/templates/admin/change_form.html:14
-#: contrib/admin/templates/admin/index.html:28
+#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/index.html:29
msgid "Add"
msgstr "Agregar"
-#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/change_form.html:26
+#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Historia"
-#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/change_form.html:27
msgid "View on site"
msgstr "Ver en el sitio"
-#: contrib/admin/templates/admin/change_form.html:31
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:37
+#: contrib/admin/templates/admin/auth/user/change_password.html:22
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Por favor, corrija el siguiente error."
msgstr[1] "Por favor, corrija los siguientes errores."
-#: contrib/admin/templates/admin/change_form.html:49
-msgid "Ordering"
-msgstr "Ordenación"
-
-#: contrib/admin/templates/admin/change_form.html:52
-msgid "Order:"
-msgstr "Orden:"
-
-#: contrib/admin/templates/admin/change_list.html:11
+#: contrib/admin/templates/admin/change_list.html:16
#, python-format
msgid "Add %(name)s"
msgstr "Agregar %(name)s"
-#: contrib/admin/templates/admin/delete_confirmation.html:8
+#: contrib/admin/templates/admin/change_list.html:26
+msgid "Filter"
+msgstr "Filtrar"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:9
#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
msgid "Delete"
msgstr "Eliminar"
-#: contrib/admin/templates/admin/delete_confirmation.html:13
+#: contrib/admin/templates/admin/delete_confirmation.html:15
#, python-format
msgid ""
"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -397,7 +576,7 @@ msgstr ""
"de objetos relacionados, pero su cuenta no tiene permiso para eliminar los "
"siguientes tipos de objetos:"
-#: contrib/admin/templates/admin/delete_confirmation.html:20
+#: contrib/admin/templates/admin/delete_confirmation.html:22
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -406,7 +585,7 @@ msgstr ""
"¿Está seguro de que quiere eliminar los %(object_name)s \"%(escaped_object)s"
"\"? Se eliminarán los siguientes objetos relacionados:"
-#: contrib/admin/templates/admin/delete_confirmation.html:25
+#: contrib/admin/templates/admin/delete_confirmation.html:27
msgid "Yes, I'm sure"
msgstr "Sí, estoy seguro"
@@ -415,41 +594,37 @@ msgstr "Sí, estoy seguro"
msgid " By %(filter_title)s "
msgstr " Por %(filter_title)s "
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filtrar"
-
-#: contrib/admin/templates/admin/index.html:17
+#: contrib/admin/templates/admin/index.html:18
#, python-format
msgid "Models available in the %(name)s application."
msgstr "Modelos disponibles en la aplicación %(name)s."
-#: contrib/admin/templates/admin/index.html:18
+#: contrib/admin/templates/admin/index.html:19
#, python-format
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/index.html:34
+#: contrib/admin/templates/admin/index.html:35
msgid "Change"
msgstr "Modificar"
-#: contrib/admin/templates/admin/index.html:44
+#: contrib/admin/templates/admin/index.html:45
msgid "You don't have permission to edit anything."
msgstr "No tiene permiso para editar nada."
-#: contrib/admin/templates/admin/index.html:52
+#: contrib/admin/templates/admin/index.html:53
msgid "Recent Actions"
msgstr "Acciones recientes"
-#: contrib/admin/templates/admin/index.html:53
+#: contrib/admin/templates/admin/index.html:54
msgid "My Actions"
msgstr "Mis acciones"
-#: contrib/admin/templates/admin/index.html:57
+#: contrib/admin/templates/admin/index.html:58
msgid "None available"
msgstr "Ninguna disponible"
-#: contrib/admin/templates/admin/invalid_setup.html:8
+#: 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 "
@@ -459,39 +634,34 @@ msgstr ""
"tablas de la misma hayan sido creadas, y asegúrese de que el usuario "
"apropiado tenga permisos de lectura en la base de datos."
-#: contrib/admin/templates/admin/login.html:17
+#: contrib/admin/templates/admin/login.html:19
#: contrib/comments/templates/comments/form.html:6
#: contrib/comments/templates/comments/form.html:8
msgid "Username:"
msgstr "Usuario:"
-#: contrib/admin/templates/admin/login.html:20
+#: contrib/admin/templates/admin/login.html:22
#: contrib/comments/templates/comments/form.html:8
msgid "Password:"
msgstr "Contraseña:"
-#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:25
-msgid "Log in"
-msgstr "Identificarse"
-
-#: contrib/admin/templates/admin/object_history.html:17
+#: contrib/admin/templates/admin/object_history.html:16
msgid "Date/time"
msgstr "Fecha/hora"
-#: contrib/admin/templates/admin/object_history.html:18
+#: contrib/admin/templates/admin/object_history.html:17
msgid "User"
msgstr "Usuario"
-#: contrib/admin/templates/admin/object_history.html:19
+#: contrib/admin/templates/admin/object_history.html:18
msgid "Action"
msgstr "Acción"
-#: contrib/admin/templates/admin/object_history.html:25
+#: contrib/admin/templates/admin/object_history.html:24
msgid "DATE_WITH_TIME_FULL"
msgstr "j M Y P"
-#: contrib/admin/templates/admin/object_history.html:35
+#: contrib/admin/templates/admin/object_history.html:32
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
@@ -543,27 +713,30 @@ msgstr ""
"Primero, introduzca un nombre de usuario y una contraseña. Luego podrá "
"configurar opciones adicionales."
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
+#: contrib/admin/templates/admin/auth/user/add_form.html:13
+#: contrib/auth/forms.py:13 contrib/auth/forms.py:50
msgid "Username"
msgstr "Nombre de usuario:"
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/add_form.html:20
#: contrib/admin/templates/admin/auth/user/change_password.html:33
+#: contrib/auth/forms.py:16 contrib/auth/forms.py:51 contrib/auth/forms.py:167
msgid "Password"
msgstr "Contraseña:"
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:38
+#: contrib/admin/templates/admin/auth/user/add_form.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/auth/forms.py:168
msgid "Password (again)"
msgstr "Contraseña (de nuevo)"
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: 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 ""
"Para verificación, introduzca la misma contraseña que introdujo arriba."
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:26
#, python-format
msgid "Enter a new password for the user %(username)s."
msgstr ""
@@ -638,7 +811,7 @@ msgstr "Editar este objeto (nueva ventana)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:28
msgid "As above, but opens the admin page in a new window."
msgstr ""
-"Como antes, pero abre la página de administración en una nueva ventana."
+"Ídem, pero abre la página de administración en una nueva ventana."
#: contrib/admin/templates/registration/logged_out.html:8
msgid "Thanks for spending some quality time with the Web site today."
@@ -648,23 +821,23 @@ msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
msgid "Log in again"
msgstr "Identificarse de nuevo"
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_form.html:5
-#: contrib/admin/templates/registration/password_change_form.html:9
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
msgid "Password change"
msgstr "Cambio de contraseña"
-#: contrib/admin/templates/registration/password_change_done.html:5
-#: contrib/admin/templates/registration/password_change_done.html:9
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
msgid "Password change successful"
msgstr "Cambio de contraseña exitoso"
-#: contrib/admin/templates/registration/password_change_done.html:11
+#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
msgstr "Su contraseña ha sido cambiada."
-#: contrib/admin/templates/registration/password_change_form.html:11
+#: 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."
@@ -673,19 +846,19 @@ msgstr ""
"luego introduzca la nueva contraseña dos veces para verificar que la ha "
"escrito correctamente."
-#: contrib/admin/templates/registration/password_change_form.html:16
+#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
msgstr "Contraseña antigua:"
-#: contrib/admin/templates/registration/password_change_form.html:18
+#: contrib/admin/templates/registration/password_change_form.html:19
msgid "New password:"
msgstr "Contraseña nueva:"
-#: contrib/admin/templates/registration/password_change_form.html:20
+#: contrib/admin/templates/registration/password_change_form.html:21
msgid "Confirm password:"
msgstr "Confirme contraseña:"
-#: contrib/admin/templates/registration/password_change_form.html:22
+#: contrib/admin/templates/registration/password_change_form.html:23
msgid "Change my password"
msgstr "Cambiar mi contraseña"
@@ -706,8 +879,8 @@ msgid ""
"We've e-mailed a new password to the e-mail address you submitted. You "
"should be receiving it shortly."
msgstr ""
-"Le hemos enviado una nueva contraseña a la dirección que ha suministrado. "
-"Debería recibirla en breve."
+"Le hemos enviado una nueva contraseña a la dirección de correo electrónico "
+"que ha suministrado. Debería recibir la misma en breve."
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
@@ -746,8 +919,8 @@ msgid ""
"Forgotten your password? Enter your e-mail address below, and we'll reset "
"your password and e-mail the new one to you."
msgstr ""
-"¿Ha olvidado su contraseña? Introduzca su dirección de correo electrónico, y "
-"crearemos una nueva que le enviaremos por correo."
+"¿Ha olvidado su contraseña?. Introduzca su dirección de correo electrónico, y "
+"crearemos una nueva la que le será enviada por dicho medio."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -757,339 +930,222 @@ msgstr "Dirección de correo electrónico:"
msgid "Reset my password"
msgstr "Recuperar mi contraseña"
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Fecha:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Hora:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Actualmente"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Modificar:"
-
#: contrib/admin/templatetags/admin_list.py:257
msgid "All dates"
msgstr "Todas las fechas"
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
+#: contrib/admin/views/main.py:66
#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Se agregó con éxito %(name)s \"%(obj)s\"."
-
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
-#: contrib/admin/views/main.py:356
-msgid "You may edit it again below."
-msgstr "Puede modificarlo nuevamente abajo."
-
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr "Agregar usuario"
-
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
-msgstr "Cambio de contraseña exitoso"
-
-#: contrib/admin/views/auth.py:65
-#, python-format
-msgid "Change password: %s"
-msgstr "Cambiar contraseña: %s"
-
-#: contrib/admin/views/decorators.py:11 contrib/auth/forms.py:60
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Por favor introduzca un nombre de usuario y una contraseña correctos. Note "
-"que ambos campos son sensibles a mayúsculas/minúsculas."
-
-#: contrib/admin/views/decorators.py:63
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"Por favor, identifíquese de nuevo porque su sesión ha caducado. No se "
-"preocupe: se ha guardado su envío."
-
-#: contrib/admin/views/decorators.py:70
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"Parece que su navegador no está configurado para aceptar cookies. Actívelas "
-"por favor, recargue esta página, e inténtelo de nuevo."
-
-#: contrib/admin/views/decorators.py:84
-msgid "Usernames cannot contain the '@' character."
-msgstr "Los nombres de usuario no pueden contener el carácter '@'."
+msgid "Select %s"
+msgstr "Seleccione %s"
-#: contrib/admin/views/decorators.py:86
+#: contrib/admin/views/main.py:66
#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Su dirección de correo no es su nombre de usuario. Intente nuevamente usando "
-"'%s'."
+msgid "Select %s to change"
+msgstr "Seleccione %s a modificar"
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
-#: contrib/admin/views/doc.py:52
+#: contrib/admindocs/views.py:53 contrib/admindocs/views.py:55
+#: contrib/admindocs/views.py:57
msgid "tag:"
msgstr "etiqueta:"
-#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
-#: contrib/admin/views/doc.py:83
+#: contrib/admindocs/views.py:87 contrib/admindocs/views.py:89
+#: contrib/admindocs/views.py:91
msgid "filter:"
msgstr "filtrar:"
-#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
-#: contrib/admin/views/doc.py:141
+#: contrib/admindocs/views.py:153 contrib/admindocs/views.py:155
+#: contrib/admindocs/views.py:157
msgid "view:"
msgstr "ver:"
-#: contrib/admin/views/doc.py:166
+#: contrib/admindocs/views.py:187
#, python-format
msgid "App %r not found"
msgstr "Aplicación %r no encontrada"
-#: contrib/admin/views/doc.py:173
+#: contrib/admindocs/views.py:194
#, python-format
-msgid "Model %(name)r not found in app %(label)r"
-msgstr "Modelo %(name)r no encontrado en aplicación %(label)r"
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr "Modelo %(model_name)r no encontrado en aplicación %(app_label)r"
-#: contrib/admin/views/doc.py:185
+#: contrib/admindocs/views.py:206
#, python-format
-msgid "the related `%(label)s.%(type)s` object"
-msgstr "el objeto `%(label)s.%(type)s` relacionado"
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "el objeto `%(app_label)s.%(data_type)s` relacionado"
-#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
-#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
msgid "model:"
msgstr "modelo:"
-#: contrib/admin/views/doc.py:216
+#: contrib/admindocs/views.py:237
#, python-format
-msgid "related `%(label)s.%(name)s` objects"
-msgstr "objetos `%(label)s.%(name)s` relacionados"
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "objetos `%(app_label)s.%(object_name)s` relacionados"
-#: contrib/admin/views/doc.py:221
+#: contrib/admindocs/views.py:242
#, python-format
msgid "all %s"
msgstr "todos los %s"
-#: contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:247
#, python-format
msgid "number of %s"
msgstr "número de %s"
-#: contrib/admin/views/doc.py:231
+#: contrib/admindocs/views.py:253
#, python-format
msgid "Fields on %s objects"
msgstr "Campos en objetos %s"
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
-#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
-#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
+#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:328
+#: contrib/admindocs/views.py:330 contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:337 contrib/admindocs/views.py:339
msgid "Integer"
msgstr "Entero"
-#: contrib/admin/views/doc.py:294
+#: contrib/admindocs/views.py:318
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadero o Falso)"
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
+#: contrib/admindocs/views.py:319 contrib/admindocs/views.py:338
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
-#: contrib/admin/views/doc.py:296
+#: contrib/admindocs/views.py:320
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
-#: contrib/admin/views/doc.py:297
+#: contrib/admindocs/views.py:321
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
-#: contrib/admin/views/doc.py:298
+#: contrib/admindocs/views.py:322
msgid "Date (with time)"
msgstr "Fecha (con hora)"
-#: contrib/admin/views/doc.py:299
+#: contrib/admindocs/views.py:323
msgid "Decimal number"
msgstr "Número decimal"
-#: contrib/admin/views/doc.py:300
+#: contrib/admindocs/views.py:324
msgid "E-mail address"
msgstr "Dirección de correo electrónico"
-#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
-#: contrib/admin/views/doc.py:305
+#: contrib/admindocs/views.py:325 contrib/admindocs/views.py:326
+#: contrib/admindocs/views.py:329
msgid "File path"
msgstr "Ruta de archivo"
-#: contrib/admin/views/doc.py:303
+#: contrib/admindocs/views.py:327
msgid "Floating point number"
msgstr "Número de punto flotante"
-#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89
+#: contrib/admindocs/views.py:331 contrib/comments/models.py:89
msgid "IP address"
msgstr "Dirección IP"
-#: contrib/admin/views/doc.py:309
+#: contrib/admindocs/views.py:333
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
-#: contrib/admin/views/doc.py:310
+#: contrib/admindocs/views.py:334
msgid "Relation to parent model"
msgstr "Relación con el modelo padre"
-#: contrib/admin/views/doc.py:311
+#: contrib/admindocs/views.py:335
msgid "Phone number"
msgstr "Número de teléfono"
-#: contrib/admin/views/doc.py:316
+#: contrib/admindocs/views.py:340
msgid "Text"
msgstr "Texto"
-#: contrib/admin/views/doc.py:317
+#: contrib/admindocs/views.py:341
msgid "Time"
msgstr "Hora"
-#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7
+#: contrib/admindocs/views.py:342 contrib/flatpages/models.py:8
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:319
+#: contrib/admindocs/views.py:343
msgid "U.S. state (two uppercase letters)"
msgstr "Estado de los EE.UU. (dos letras mayúsculas)"
-#: contrib/admin/views/doc.py:320
+#: contrib/admindocs/views.py:344
msgid "XML text"
msgstr "Texto XML"
-#: contrib/admin/views/doc.py:346
+#: contrib/admindocs/views.py:370
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s no parece ser un objeto urlpattern"
-#: contrib/admin/views/main.py:233
-msgid "Site administration"
-msgstr "Administración de sitio"
-
-#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puede agregar otro %s abajo."
-
-#: contrib/admin/views/main.py:298
-#, python-format
-msgid "Add %s"
-msgstr "Agregar %s"
-
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Added %s."
-msgstr "Agregado %s."
-
-#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
-#: contrib/admin/views/main.py:348 core/validators.py:283
-#: db/models/manipulators.py:309
-msgid "and"
-msgstr "y"
+#: contrib/auth/admin.py:17
+msgid "Personal info"
+msgstr "Información personal"
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Changed %s."
-msgstr "Modifica %s."
+#: contrib/auth/admin.py:18
+msgid "Permissions"
+msgstr "Permisos"
-#: contrib/admin/views/main.py:348
-#, python-format
-msgid "Deleted %s."
-msgstr "Eliminó %s."
+#: contrib/auth/admin.py:19
+msgid "Important dates"
+msgstr "Fechas importantes"
-#: contrib/admin/views/main.py:351
-msgid "No fields changed."
-msgstr "No ha modificado ningún campo."
+#: contrib/auth/admin.py:20
+msgid "Groups"
+msgstr "Grupos"
-#: contrib/admin/views/main.py:354
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Se modificó con éxito %(name)s \"%(obj)s\"."
+#: contrib/auth/admin.py:47
+msgid "Add user"
+msgstr "Agregar usuario"
-#: contrib/admin/views/main.py:362
-#, python-format
+#: contrib/auth/forms.py:14 contrib/auth/models.py:134
msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
+"digits and underscores)."
msgstr ""
-"Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo nuevamente abajo."
-
-#: contrib/admin/views/main.py:400
-#, python-format
-msgid "Change %s"
-msgstr "Modificar %s"
-
-#: contrib/admin/views/main.py:487
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Uno o más %(fieldname)s en %(name)s: %(obj)s"
-
-#: contrib/admin/views/main.py:492
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Uno o más %(fieldname)s en %(name)s:"
-
-#: contrib/admin/views/main.py:524
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"."
-
-#: contrib/admin/views/main.py:527
-msgid "Are you sure?"
-msgstr "¿Está seguro?"
-
-#: contrib/admin/views/main.py:549
-#, python-format
-msgid "Change history: %s"
-msgstr "Historia de modificaciones: %s"
+"Obligatorio. Longitud máxima 30 caracteres alfanuméricos (letras, dígitos y "
+"guiones bajos)."
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s"
-msgstr "Seleccione %s"
+#: contrib/auth/forms.py:15 core/validators.py:72
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Este valor debe contener sólo letras, números y guiones bajos."
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s to change"
-msgstr "Seleccione %s a modificar"
+#: contrib/auth/forms.py:17
+msgid "Password confirmation"
+msgstr "Confirmación de contraseña"
-#: contrib/admin/views/main.py:784
-msgid "Database error"
-msgstr "Error de base de datos"
+#: contrib/auth/forms.py:29
+msgid "A user with that username already exists."
+msgstr "Ya existe un usuario con ese nombre."
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
+#: contrib/auth/forms.py:35 contrib/auth/forms.py:154
+#: contrib/auth/forms.py:179
msgid "The two password fields didn't match."
msgstr "Los dos campos de contraseñas no coinciden entre si."
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "Ya existe un usuario con ese nombre."
+#: contrib/auth/forms.py:73 contrib/comments/views/comments.py:58
+msgid "This account is inactive."
+msgstr "Esta cuenta está inactiva"
-#: contrib/auth/forms.py:53
+#: contrib/auth/forms.py:78 contrib/comments/views/comments.py:49
msgid ""
"Your Web browser doesn't appear to have cookies enabled. Cookies are "
"required for logging in."
msgstr ""
-"Su navegador Web aparenta no tener cookies activas. Las cookies son un "
-"requerimiento para poder ingresar."
+"Su navegador Web aparenta no estar configurado para aceptar cookies. Las "
+"cookies son un requerimiento para poder ingresar."
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
-msgstr "Esta cuenta está inactiva"
+#: contrib/auth/forms.py:91
+msgid "E-mail"
+msgstr "Correo electrónico"
-#: contrib/auth/forms.py:84
+#: contrib/auth/forms.py:100
msgid ""
"That e-mail address doesn't have an associated user account. Are you sure "
"you've registered?"
@@ -1097,16 +1153,24 @@ msgstr ""
"Esa dirección de e-mail no está asociada a ninguna cuenta de usuario. ¿Está "
"seguro de que ya se ha registrado?"
-#: contrib/auth/forms.py:107
+#: contrib/auth/forms.py:125
#, python-format
msgid "Password reset on %s"
msgstr "Reinicialización de contraseña en %s"
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr "Los dos campos 'nueva contraseña' no coinciden entre si."
+#: contrib/auth/forms.py:132
+msgid "Old password"
+msgstr "Contraseña antigua"
+
+#: contrib/auth/forms.py:133
+msgid "New password"
+msgstr "Contraseña nueva"
+
+#: contrib/auth/forms.py:134
+msgid "New password confirmation"
+msgstr "Confirmación de contraseña nueva"
-#: contrib/auth/forms.py:124
+#: contrib/auth/forms.py:146
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr ""
"La antigua contraseña introducida es incorrecta. Por favor introdúzcala "
@@ -1132,39 +1196,31 @@ msgstr "permisos"
msgid "group"
msgstr "grupo"
-#: contrib/auth/models.py:98 contrib/auth/models.py:141
+#: contrib/auth/models.py:98 contrib/auth/models.py:144
msgid "groups"
msgstr "grupos"
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:134
msgid "username"
msgstr "nombre de usuario"
-#: contrib/auth/models.py:131
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
-msgstr ""
-"Requerido. Longitud máxima 30 caracteres alfanuméricos (letras, dígitos y "
-"guiones bajos)."
-
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:135
msgid "first name"
msgstr "nombre"
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:136
msgid "last name"
msgstr "apellido"
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:137
msgid "e-mail address"
-msgstr "dirección de correo"
+msgstr "dirección de correo electrónico"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:138
msgid "password"
msgstr "contraseña"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:138
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the change "
"password form."
@@ -1172,47 +1228,47 @@ msgstr ""
"Use '[algo]$[salt]$[hexdigest]' o use el formulario de "
"cambio de contraseña."
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:139
msgid "staff status"
msgstr "es staff"
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:139
msgid "Designates whether the user can log into this admin site."
msgstr "Indica si el usuario puede ingresar a este sitio de administración."
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:140
msgid "active"
msgstr "activo"
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:140
msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
+"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
msgstr ""
-"Indica si el usuario puede ingresar al sitio de administración Django. "
-"Desactive este campo en lugar de eliminar usuarios."
+"Indica si el usuario debe ser tratado como un usuario activo. Desactive este "
+"campo en lugar de eliminar usuarios."
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:141
msgid "superuser status"
msgstr "es superusuario"
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:141
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
msgstr ""
-"Indica que este usuario posee todos los permisos, sin que sea necesario "
+"Indica que este usuario posee todos los permisos sin que sea necesario "
"asignarle los mismos en forma explícita."
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:142
msgid "last login"
msgstr "último ingreso"
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:143
msgid "date joined"
msgstr "fecha de creación"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:145
msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
@@ -1220,43 +1276,36 @@ msgstr ""
"Además de los permisos asignados manualmente, este usuario también poseerá "
"todos los permisos de los grupos a los que pertenezca."
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:146
msgid "user permissions"
msgstr "permisos de usuario"
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:150
msgid "user"
msgstr "usuario"
-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:151
msgid "users"
msgstr "usuarios"
-#: contrib/auth/models.py:154
-msgid "Personal info"
-msgstr "Información personal"
-
-#: contrib/auth/models.py:155
-msgid "Permissions"
-msgstr "Permisos"
-
-#: contrib/auth/models.py:156
-msgid "Important dates"
-msgstr "Fechas importantes"
-
-#: contrib/auth/models.py:157
-msgid "Groups"
-msgstr "Grupos"
-
-#: contrib/auth/models.py:316
+#: contrib/auth/models.py:306
msgid "message"
msgstr "mensaje"
-#: contrib/auth/views.py:47
+#: contrib/auth/views.py:49
msgid "Logged out"
msgstr "Sesión cerrada"
-#: contrib/comments/models.py:71 contrib/comments/models.py:176
+#: contrib/auth/views.py:116
+msgid "Password changed successfully."
+msgstr "Cambio de contraseña exitoso"
+
+#: contrib/auth/views.py:122
+#, python-format
+msgid "Change password: %s"
+msgstr "Cambiar contraseña: %s"
+
+#: contrib/comments/models.py:71 contrib/comments/models.py:164
msgid "object ID"
msgstr "ID de objeto"
@@ -1265,7 +1314,7 @@ msgid "headline"
msgstr "encabezado"
#: contrib/comments/models.py:73 contrib/comments/models.py:95
-#: contrib/comments/models.py:177
+#: contrib/comments/models.py:165
msgid "comment"
msgstr "comentario"
@@ -1305,11 +1354,11 @@ msgstr "calificación 8"
msgid "is valid rating"
msgstr "es calificación válida"
-#: contrib/comments/models.py:87 contrib/comments/models.py:179
+#: contrib/comments/models.py:87 contrib/comments/models.py:167
msgid "date/time submitted"
msgstr "fecha/hora de envío"
-#: contrib/comments/models.py:88 contrib/comments/models.py:180
+#: contrib/comments/models.py:88 contrib/comments/models.py:168
msgid "is public"
msgstr "es público"
@@ -1329,11 +1378,11 @@ msgstr ""
msgid "comments"
msgstr "comentarios"
-#: contrib/comments/models.py:140 contrib/comments/models.py:222
+#: contrib/comments/models.py:128 contrib/comments/models.py:199
msgid "Content object"
msgstr "Objeto contenido"
-#: contrib/comments/models.py:168
+#: contrib/comments/models.py:156
#, python-format
msgid ""
"Posted by %(user)s at %(date)s\n"
@@ -1348,48 +1397,48 @@ msgstr ""
"\n"
"http://%(domain)s%(url)s"
-#: contrib/comments/models.py:178
+#: contrib/comments/models.py:166
msgid "person's name"
msgstr "nombre de la persona"
-#: contrib/comments/models.py:181
+#: contrib/comments/models.py:169
msgid "ip address"
msgstr "dirección ip"
-#: contrib/comments/models.py:183
+#: contrib/comments/models.py:171
msgid "approved by staff"
msgstr "aprobado por el staff"
-#: contrib/comments/models.py:187
+#: contrib/comments/models.py:175
msgid "free comment"
msgstr "comentario libre"
-#: contrib/comments/models.py:188
+#: contrib/comments/models.py:176
msgid "free comments"
msgstr "comentarios libres"
-#: contrib/comments/models.py:250
+#: contrib/comments/models.py:227
msgid "score"
msgstr "puntuación"
-#: contrib/comments/models.py:251
+#: contrib/comments/models.py:228
msgid "score date"
msgstr "fecha de la puntuación"
-#: contrib/comments/models.py:255
+#: contrib/comments/models.py:232
msgid "karma score"
msgstr "punto karma"
-#: contrib/comments/models.py:256
+#: contrib/comments/models.py:233
msgid "karma scores"
msgstr "puntos karma"
-#: contrib/comments/models.py:260
+#: contrib/comments/models.py:237
#, python-format
msgid "%(score)d rating by %(user)s"
msgstr "puntuado %(score)d por %(user)s"
-#: contrib/comments/models.py:277
+#: contrib/comments/models.py:254
#, python-format
msgid ""
"This comment was flagged by %(user)s:\n"
@@ -1400,36 +1449,36 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/models.py:285
+#: contrib/comments/models.py:262
msgid "flag date"
msgstr "fecha de la marca"
-#: contrib/comments/models.py:289
+#: contrib/comments/models.py:266
msgid "user flag"
msgstr "marca de usuario"
-#: contrib/comments/models.py:290
+#: contrib/comments/models.py:267
msgid "user flags"
msgstr "marcas de usuario"
-#: contrib/comments/models.py:294
+#: contrib/comments/models.py:271
#, python-format
msgid "Flag by %r"
msgstr "Marca de %r"
-#: contrib/comments/models.py:300
+#: contrib/comments/models.py:277
msgid "deletion date"
msgstr "fecha de eliminación"
-#: contrib/comments/models.py:303
+#: contrib/comments/models.py:280
msgid "moderator deletion"
-msgstr "Eliminación por moderador"
+msgstr "eliminación por moderador"
-#: contrib/comments/models.py:304
+#: contrib/comments/models.py:281
msgid "moderator deletions"
msgstr "eliminaciones por moderador"
-#: contrib/comments/models.py:308
+#: contrib/comments/models.py:285
#, python-format
msgid "Moderator deletion by %r"
msgstr "Eliminación del moderador %r"
@@ -1445,7 +1494,7 @@ msgstr "Calificaciones"
#: contrib/comments/templates/comments/form.html:12
#: contrib/comments/templates/comments/form.html:23
msgid "Required"
-msgstr "Requerido"
+msgstr "Obligatorio"
#: contrib/comments/templates/comments/form.html:12
#: contrib/comments/templates/comments/form.html:23
@@ -1470,12 +1519,12 @@ msgstr "Previsualizar comentario"
msgid "Your name:"
msgstr "Su nombre:"
-#: contrib/comments/views/comments.py:28
+#: contrib/comments/views/comments.py:76
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr "Se precisa esta puntuación porque ha introducido al menos otra más."
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:160
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
@@ -1498,7 +1547,7 @@ msgstr[1] ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:117
+#: contrib/comments/views/comments.py:165
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -1509,25 +1558,25 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:190
-#: contrib/comments/views/comments.py:283
+#: contrib/comments/views/comments.py:238
+#: contrib/comments/views/comments.py:331
msgid "Only POSTs are allowed"
msgstr "Sólo se admiten POSTs"
-#: contrib/comments/views/comments.py:194
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:242
+#: contrib/comments/views/comments.py:335
msgid "One or more of the required fields wasn't submitted"
-msgstr "No se proporcionó uno o más de los siguientes campos requeridos"
+msgstr "No se proporcionó uno o más de los campos obligatorios"
-#: contrib/comments/views/comments.py:198
-#: contrib/comments/views/comments.py:289
+#: contrib/comments/views/comments.py:246
+#: contrib/comments/views/comments.py:337
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
"Alguien está jugando con el formulario de comentarios (violación de "
"seguridad)"
-#: contrib/comments/views/comments.py:208
-#: contrib/comments/views/comments.py:295
+#: contrib/comments/views/comments.py:256
+#: contrib/comments/views/comments.py:343
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
@@ -1535,10 +1584,10 @@ msgstr ""
"El formulario de comentarios tiene un parámetro 'target' no válido (el ID de "
"objeto era inválido)"
-#: contrib/comments/views/comments.py:259
-#: contrib/comments/views/comments.py:324
+#: contrib/comments/views/comments.py:307
+#: contrib/comments/views/comments.py:372
msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr "El formulario de comentario no proporcionó 'previsualizar' ni 'enviar'"
+msgstr "El formulario de comentarios no proporcionó 'previsualizar' ni 'enviar'"
#: contrib/comments/views/karma.py:21
msgid "Anonymous users cannot vote"
@@ -1552,42 +1601,46 @@ msgstr "ID de comentario no válido"
msgid "No voting for yourself"
msgstr "Ud. no puede votarse a sí mismo"
-#: contrib/contenttypes/models.py:37
+#: contrib/contenttypes/models.py:67
msgid "python model class name"
msgstr "nombre de la clase python del modelo"
-#: contrib/contenttypes/models.py:40
+#: contrib/contenttypes/models.py:71
msgid "content type"
msgstr "tipo de contenido"
-#: contrib/contenttypes/models.py:41
+#: contrib/contenttypes/models.py:72
msgid "content types"
msgstr "tipos de contenido"
-#: contrib/flatpages/models.py:8
+#: contrib/flatpages/admin.py:9
+msgid "Advanced options"
+msgstr "Opciones avanzadas"
+
+#: contrib/flatpages/models.py:9
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Ejemplo: '/about/contact/'. Asegúrese de usar barras '/' al principio y al "
"final."
-#: contrib/flatpages/models.py:9
+#: contrib/flatpages/models.py:10
msgid "title"
msgstr "título"
-#: contrib/flatpages/models.py:10
+#: contrib/flatpages/models.py:11
msgid "content"
msgstr "contenido"
-#: contrib/flatpages/models.py:11
+#: contrib/flatpages/models.py:12
msgid "enable comments"
msgstr "activar comentarios"
-#: contrib/flatpages/models.py:12
+#: contrib/flatpages/models.py:13
msgid "template name"
msgstr "nombre de plantilla"
-#: contrib/flatpages/models.py:13
+#: contrib/flatpages/models.py:14
msgid ""
"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
"will use 'flatpages/default.html'."
@@ -1595,126 +1648,126 @@ msgstr ""
"Ejemplo: 'flatpages/contact_page.html'. Si no lo proporciona, el sistema "
"usará 'flatpages/default.html'."
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
msgid "registration required"
msgstr "debe estar registrado"
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr "Si está marcado, sólo los usuarios registrados podrán ver la página."
-#: contrib/flatpages/models.py:18
+#: contrib/flatpages/models.py:20
msgid "flat page"
msgstr "página estática"
-#: contrib/flatpages/models.py:19
+#: contrib/flatpages/models.py:21
msgid "flat pages"
msgstr "páginas estáticas"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "th"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "st"
msgstr "st"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "nd"
msgstr "nd"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "rd"
msgstr "rd"
-#: contrib/humanize/templatetags/humanize.py:52
+#: contrib/humanize/templatetags/humanize.py:51
#, python-format
msgid "%(value).1f million"
msgid_plural "%(value).1f million"
msgstr[0] "%(value).1f millón"
msgstr[1] "%(value).1f millones"
-#: contrib/humanize/templatetags/humanize.py:55
+#: contrib/humanize/templatetags/humanize.py:54
#, python-format
msgid "%(value).1f billion"
msgid_plural "%(value).1f billion"
msgstr[0] "%(value).1f millardo"
msgstr[1] "%(value).1f millardos"
-#: contrib/humanize/templatetags/humanize.py:58
+#: contrib/humanize/templatetags/humanize.py:57
#, python-format
msgid "%(value).1f trillion"
msgid_plural "%(value).1f trillion"
msgstr[0] "%(value).1f billón"
msgstr[1] "%(value).1f billones"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "one"
msgstr "uno"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "two"
msgstr "dos"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "three"
msgstr "tres"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "four"
msgstr "cuatro"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "five"
msgstr "cinco"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "six"
msgstr "seis"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "seven"
msgstr "siete"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "eight"
msgstr "ocho"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "nine"
msgstr "nueve"
-#: contrib/humanize/templatetags/humanize.py:94
+#: contrib/humanize/templatetags/humanize.py:93
msgid "today"
msgstr "hoy"
-#: contrib/humanize/templatetags/humanize.py:96
+#: contrib/humanize/templatetags/humanize.py:95
msgid "tomorrow"
msgstr "mañana"
-#: contrib/humanize/templatetags/humanize.py:98
+#: contrib/humanize/templatetags/humanize.py:97
msgid "yesterday"
msgstr "ayer"
-#: contrib/localflavor/ar/forms.py:28
+#: contrib/localflavor/ar/forms.py:27
msgid "Enter a postal code in the format NNNN or ANNNNAAA."
msgstr "Introduzca un código postal en formato NNNN o ANNNNAAA."
-#: contrib/localflavor/ar/forms.py:50 contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96
#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23
#: contrib/localflavor/pe/forms.py:51
msgid "This field requires only numbers."
msgstr "Este campo permite sólo valores numéricos."
-#: contrib/localflavor/ar/forms.py:51
+#: contrib/localflavor/ar/forms.py:50
msgid "This field requires 7 or 8 digits."
msgstr "Este campo requiere 7 u 8 dígitos."
-#: contrib/localflavor/ar/forms.py:80
+#: contrib/localflavor/ar/forms.py:79
msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
msgstr "Introduzca un CUIT válido en formato XX-XXXXXXXX-X o XXXXXXXXXXX."
-#: contrib/localflavor/ar/forms.py:81
+#: contrib/localflavor/ar/forms.py:80
msgid "Invalid CUIT."
msgstr "CUIT inválido."
@@ -1869,7 +1922,7 @@ msgstr "Zurich"
#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12
msgid "Enter a zip code in the format XXXX."
-msgstr "Introduzca un zip code en formato XXX."
+msgstr "Introduzca un zip code en formato XXXX."
#: contrib/localflavor/ch/forms.py:64
msgid ""
@@ -2311,7 +2364,7 @@ msgstr "Introduzca un número de Seguridad Social válido."
msgid "Enter a valid VAT number."
msgstr "Introduzca un número VAT válido."
-#: contrib/localflavor/jp/forms.py:19
+#: contrib/localflavor/jp/forms.py:17
msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
msgstr "Introduzca un código postal en formato XXXXXX o XXX-XXXX."
@@ -3156,7 +3209,7 @@ msgstr "region Zilina"
#: contrib/localflavor/uk/forms.py:21
msgid "Enter a valid postcode."
-msgstr "Introduzca un postcde válido."
+msgstr "Introduzca un postcode válido."
#: contrib/localflavor/uk/uk_regions.py:11
msgid "Bedfordshire"
@@ -3327,10 +3380,13 @@ msgid "County Armagh"
msgstr "County Armagh"
#: contrib/localflavor/uk/uk_regions.py:57
-#: contrib/localflavor/uk/uk_regions.py:58
msgid "County Down"
msgstr "County Down"
+#: contrib/localflavor/uk/uk_regions.py:58
+msgid "County Fermanagh"
+msgstr "County Fermarmagh"
+
#: contrib/localflavor/uk/uk_regions.py:59
msgid "County Londonderry"
msgstr "County Londonderry"
@@ -3496,7 +3552,7 @@ msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
msgstr ""
-"Esta ruta debería ser absoluta, excluyendo el nombre de dominio. Ejemplo: '/"
+"Esta ruta debe ser absoluta, excluyendo el nombre de dominio. Ejemplo: '/"
"events/search/'."
#: contrib/redirects/models.py:9
@@ -3519,7 +3575,7 @@ msgstr "redirección"
msgid "redirects"
msgstr "redirecciones"
-#: contrib/sessions/models.py:46
+#: contrib/sessions/models.py:45
msgid "session key"
msgstr "clave de sesión"
@@ -3547,18 +3603,14 @@ msgstr "nombre de dominio"
msgid "display name"
msgstr "nombre para visualizar"
-#: contrib/sites/models.py:37
+#: contrib/sites/models.py:38
msgid "site"
msgstr "sitio"
-#: contrib/sites/models.py:38
+#: contrib/sites/models.py:39
msgid "sites"
msgstr "sitios"
-#: core/validators.py:72
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Este valor debe contener sólo letras, números y guiones bajos."
-
#: core/validators.py:76
msgid ""
"This value must contain only letters, numbers, underscores, dashes or "
@@ -3604,7 +3656,7 @@ msgstr "No se admiten caracteres no numéricos."
msgid "This value can't be comprised solely of digits."
msgstr "Este valor no puede estar formado sólo por dígitos."
-#: core/validators.py:128 newforms/fields.py:151
+#: core/validators.py:128 forms/fields.py:157
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
@@ -3613,37 +3665,32 @@ msgid "Only alphabetical characters are allowed here."
msgstr "Sólo se admiten caracteres alfabéticos."
#: core/validators.py:147
-msgid "Year must be 1900 or later."
-msgstr "El año debe ser 1900 o posterior."
-
-#: core/validators.py:151
#, python-format
msgid "Invalid date: %s"
msgstr "Fecha no válida: %s"
-#: core/validators.py:156 db/models/fields/__init__.py:509
+#: core/validators.py:152 db/models/fields/__init__.py:550
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Introduzca una fecha válida en formato AAAA-MM-DD."
-#: core/validators.py:161
+#: core/validators.py:157
msgid "Enter a valid time in HH:MM format."
msgstr "Introduzca una hora válida en formato HH:MM."
-#: core/validators.py:165 db/models/fields/__init__.py:583
+#: core/validators.py:161 db/models/fields/__init__.py:631
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Introduzca una fecha/hora válida en formato AAAA-MM-DD HH:MM."
-#: core/validators.py:170 newforms/fields.py:402
+#: core/validators.py:166 forms/fields.py:408
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida"
-#: core/validators.py:182 core/validators.py:474 newforms/fields.py:432
-#: oldforms/__init__.py:687
+#: core/validators.py:178 core/validators.py:470 forms/fields.py:426
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"No se envió un archivo. Verifique el tipo de codificación en el formulario."
-#: core/validators.py:193 newforms/fields.py:458
+#: core/validators.py:189 forms/fields.py:466
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -3651,28 +3698,28 @@ msgstr ""
"Envíe una imagen válida. El archivo que ha enviado no era una imagen o se "
"trataba de una imagen corrupta."
-#: core/validators.py:200
+#: core/validators.py:196
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "La URL %s no apunta a una imagen válida."
-#: core/validators.py:204
+#: core/validators.py:200
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
msgstr ""
"Los números telefónicos deben respetar el formato XXX-XXX-XXXX. \"%s\" no es "
"válido."
-#: core/validators.py:212
+#: core/validators.py:208
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "La URL %s no apunta a un vídeo QuickTime válido."
+msgstr "La URL %s no apunta a un video QuickTime válido."
-#: core/validators.py:216
+#: core/validators.py:212
msgid "A valid URL is required."
msgstr "Se precisa una URL válida."
-#: core/validators.py:230
+#: core/validators.py:226
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
@@ -3681,84 +3728,84 @@ msgstr ""
"Se precisa HTML válido. Los errores específicos son:\n"
"%s"
-#: core/validators.py:237
+#: core/validators.py:233
#, python-format
msgid "Badly formed XML: %s"
msgstr "XML mal formado: %s"
-#: core/validators.py:254
+#: core/validators.py:250
#, python-format
msgid "Invalid URL: %s"
msgstr "URL no válida: %s"
-#: core/validators.py:259 core/validators.py:261
+#: core/validators.py:255 core/validators.py:257
#, python-format
msgid "The URL %s is a broken link."
msgstr "La URL %s es un enlace roto."
-#: core/validators.py:267
+#: core/validators.py:263
msgid "Enter a valid U.S. state abbreviation."
msgstr "Introduzca una abreviatura válida de estado de los EE.UU."
-#: core/validators.py:281
+#: core/validators.py:277
#, 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] "¡Vigila tu boca! Aquí no admitimos la palabra %s."
msgstr[1] "¡Vigila tu boca! Aquí no admitimos las palabras %s."
-#: core/validators.py:288
+#: core/validators.py:284
#, python-format
msgid "This field must match the '%s' field."
msgstr "Este campo debe concordar con el campo '%s'."
-#: core/validators.py:307
+#: core/validators.py:303
msgid "Please enter something for at least one field."
msgstr "Por favor, introduzca algo en al menos un campo."
-#: core/validators.py:316 core/validators.py:327
+#: core/validators.py:312 core/validators.py:323
msgid "Please enter both fields or leave them both empty."
msgstr "Por favor, rellene ambos campos o deje ambos vacíos."
-#: core/validators.py:335
+#: core/validators.py:331
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "Se debe proporcionar este campo si %(field)s es %(value)s"
-#: core/validators.py:348
+#: core/validators.py:344
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s"
-#: core/validators.py:367
+#: core/validators.py:363
msgid "Duplicate values are not allowed."
msgstr "No se admiten valores duplicados."
-#: core/validators.py:382
+#: core/validators.py:378
#, python-format
msgid "This value must be between %(lower)s and %(upper)s."
msgstr "Este valor debe estar entre %(lower)s y %(upper)s."
-#: core/validators.py:384
+#: core/validators.py:380
#, python-format
msgid "This value must be at least %s."
msgstr "Este valor debe ser al menos %s."
-#: core/validators.py:386
+#: core/validators.py:382
#, python-format
msgid "This value must be no more than %s."
msgstr "Este valor debe ser no mayor que %s."
-#: core/validators.py:427
+#: core/validators.py:423
#, python-format
msgid "This value must be a power of %s."
msgstr "Este valor debe ser una potencia de %s."
-#: core/validators.py:437
+#: core/validators.py:433
msgid "Please enter a valid decimal number."
msgstr "Por favor, introduzca un número decimal válido."
-#: core/validators.py:444
+#: core/validators.py:440
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
msgid_plural ""
@@ -3770,7 +3817,7 @@ msgstr[1] ""
"Por favor, introduzca un número decimal válido con un maximo de %s dígitos "
"en total."
-#: core/validators.py:447
+#: core/validators.py:443
#, python-format
msgid ""
"Please enter a valid decimal number with a whole part of at most %s digit."
@@ -3783,7 +3830,7 @@ msgstr[1] ""
"Por favor, introduzca un número decimal válido con un máximo de %s dígitos "
"enteros."
-#: core/validators.py:450
+#: core/validators.py:446
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural ""
@@ -3795,36 +3842,36 @@ msgstr[1] ""
"Por favor, introduzca un número decimal válido con un máximo de %s "
"posiciones decimales."
-#: core/validators.py:458
+#: core/validators.py:454
msgid "Please enter a valid floating point number."
msgstr "Por favor introduzca un número de punto flotante válido."
-#: core/validators.py:467
+#: core/validators.py:463
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr ""
"Asegúrese de que el archivo que envía es de un tamaño mínimo de %s bytes."
-#: core/validators.py:468
+#: core/validators.py:464
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr ""
"Asegúrese de que el archivo que envía es de un tamaño máximo de %s bytes."
-#: core/validators.py:485
+#: core/validators.py:481
msgid "The format for this field is wrong."
msgstr "El formato de este campo es incorrecto."
-#: core/validators.py:500
+#: core/validators.py:496
msgid "This field is invalid."
msgstr "Este campo no es válido."
-#: core/validators.py:536
+#: core/validators.py:532
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "No se pudo obtener nada de %s."
-#: core/validators.py:539
+#: core/validators.py:535
#, python-format
msgid ""
"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@@ -3832,7 +3879,7 @@ msgstr ""
"La URL %(url)s devolvió la cabecera Content-Type '%(contenttype)s', que no "
"es válida."
-#: core/validators.py:572
+#: core/validators.py:568
#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -3841,7 +3888,7 @@ msgstr ""
"Por favor, cierre la etiqueta %(tag)s de la línea %(line)s. (La línea "
"empieza con \"%(start)s\".)"
-#: core/validators.py:576
+#: core/validators.py:572
#, python-format
msgid ""
"Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -3850,7 +3897,7 @@ msgstr ""
"Parte del texto que comienza en la línea %(line)s no está permitido en ese "
"contexto. (La línea empieza con \"%(start)s\".)"
-#: core/validators.py:581
+#: core/validators.py:577
#, python-format
msgid ""
"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -3859,7 +3906,7 @@ msgstr ""
"El \"%(attr)s\" de la línea %(line)s no es un atributo válido. (La línea "
"empieza con \"%(start)s\".)"
-#: core/validators.py:586
+#: core/validators.py:582
#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -3868,7 +3915,7 @@ msgstr ""
"La \"<%(tag)s>\" de la línea %(line)s no es una etiqueta válida. (La línea "
"empieza con \"%(start)s\".)"
-#: core/validators.py:590
+#: core/validators.py:586
#, python-format
msgid ""
"A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -3877,7 +3924,7 @@ msgstr ""
"A una etiqueta de la línea %(line)s le faltan uno o más atributos "
"requeridos. (La línea empieza con \"%(start)s\".)"
-#: core/validators.py:595
+#: core/validators.py:591
#, python-format
msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -3886,63 +3933,59 @@ msgstr ""
"El atributo \"%(attr)s\" de la línea %(line)s tiene un valor que no es "
"válido. (La línea empieza con \"%(start)s\".)"
-#: db/models/manipulators.py:308
+#: db/models/manipulators.py:304
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "Ya existe un(a) %(object)s con este/a %(type)s para %(field)s."
-#: db/models/fields/__init__.py:52
+#: db/models/fields/__init__.py:47
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "Ya existe %(optname)s con este %(fieldname)s."
-#: db/models/fields/__init__.py:161 db/models/fields/__init__.py:318
-#: db/models/fields/__init__.py:735 db/models/fields/__init__.py:746
-#: newforms/fields.py:45 oldforms/__init__.py:374
+#: db/models/fields/__init__.py:175 db/models/fields/__init__.py:343
+#: db/models/fields/__init__.py:793 db/models/fields/__init__.py:804
+#: forms/fields.py:51 oldforms/__init__.py:374
msgid "This field is required."
msgstr "Este campo es obligatorio."
-#: db/models/fields/__init__.py:418
+#: db/models/fields/__init__.py:450
msgid "This value must be an integer."
msgstr "Este valor debe ser un número entero."
-#: db/models/fields/__init__.py:454
+#: db/models/fields/__init__.py:489
msgid "This value must be either True or False."
msgstr "Este valor debe ser True o False."
-#: db/models/fields/__init__.py:475
+#: db/models/fields/__init__.py:513
msgid "This field cannot be null."
msgstr "Este campo no puede ser nulo."
-#: db/models/fields/__init__.py:644
+#: db/models/fields/__init__.py:700
msgid "This value must be a decimal number."
msgstr "Este valor debe ser un número decimal."
-#: db/models/fields/__init__.py:755
+#: db/models/fields/__init__.py:813
msgid "Enter a valid filename."
msgstr "Introduzca un nombre de archivo válido."
-#: db/models/fields/__init__.py:908
+#: db/models/fields/__init__.py:1004
msgid "This value must be either None, True or False."
msgstr "Este valor debe ser None, True o False."
-#: db/models/fields/related.py:55
+#: db/models/fields/related.py:94
#, python-format
msgid "Please enter a valid %s."
msgstr "Por favor, introduzca un %s válido."
-#: db/models/fields/related.py:658
-msgid "Separate multiple IDs with commas."
-msgstr "Separe múltiples identificadores con comas."
-
-#: db/models/fields/related.py:660
+#: db/models/fields/related.py:729
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Mantenga presionada \"Control\" (\"Command\" en una Mac) para seleccionar "
"más de uno."
-#: db/models/fields/related.py:707
+#: db/models/fields/related.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -3954,103 +3997,103 @@ msgstr[1] ""
"Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son "
"válidos."
-#: newforms/fields.py:46
+#: forms/fields.py:52
msgid "Enter a valid value."
msgstr "Introduzca un valor válido."
-#: newforms/fields.py:123
+#: forms/fields.py:129
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Asegúrese de que este valor tenga como máximo %(max)d caracteres (tiene %"
"(length)d)."
-#: newforms/fields.py:124
+#: forms/fields.py:130
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Asegúrese de que este valor tenga al menos %(min)d caracteres (tiene %"
"(length)d)."
-#: newforms/fields.py:152 newforms/fields.py:181 newforms/fields.py:210
+#: forms/fields.py:158 forms/fields.py:187 forms/fields.py:216
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Asegúrese de que este valor sea menor o igual a %s."
-#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211
+#: forms/fields.py:159 forms/fields.py:188 forms/fields.py:217
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Asegúrese de que este valor sea mayor o igual a %s."
-#: newforms/fields.py:180 newforms/fields.py:209
+#: forms/fields.py:186 forms/fields.py:215
msgid "Enter a number."
msgstr "Introduzca un número."
-#: newforms/fields.py:212
+#: forms/fields.py:218
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Asegúrese de que no existan en total mas de %s dígitos."
-#: newforms/fields.py:213
+#: forms/fields.py:219
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Asegúrese de que no existan mas de %s lugares decimales."
-#: newforms/fields.py:214
+#: forms/fields.py:220
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Asegúrese de que no existan mas de %s dígitos antes del punto decimal."
-#: newforms/fields.py:262 newforms/fields.py:723
+#: forms/fields.py:268 forms/fields.py:790
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
-#: newforms/fields.py:295 newforms/fields.py:724
+#: forms/fields.py:301 forms/fields.py:791
msgid "Enter a valid time."
msgstr "Introduzca una hora válida."
-#: newforms/fields.py:334
+#: forms/fields.py:340
msgid "Enter a valid date/time."
msgstr "Introduzca una fecha/hora válida."
-#: newforms/fields.py:433
+#: forms/fields.py:427
msgid "No file was submitted."
msgstr "No se envió ningún archivo."
-#: newforms/fields.py:434 oldforms/__init__.py:689
+#: forms/fields.py:428 oldforms/__init__.py:693
msgid "The submitted file is empty."
msgstr "El archivo enviado está vacío."
-#: newforms/fields.py:496
+#: forms/fields.py:522
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
-#: newforms/fields.py:497
+#: forms/fields.py:523
msgid "This URL appears to be a broken link."
msgstr "La URL parece ser un enlace roto."
-#: newforms/fields.py:559 newforms/models.py:317
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-"Seleccione una opción válida. Esa opción no es una de las opciones "
-"disponibles."
-
-#: newforms/fields.py:598
+#: forms/fields.py:588 forms/fields.py:639
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Seleccione una opción válida. %(value)s no es una de las opciones "
"disponibles."
-#: newforms/fields.py:599 newforms/fields.py:661 newforms/models.py:377
+#: forms/fields.py:640 forms/fields.py:701 forms/models.py:581
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
-#: newforms/fields.py:752
+#: forms/fields.py:819
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida"
-#: newforms/models.py:378
+#: forms/models.py:514
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Seleccione una opción válida. Esa opción no es una de las opciones "
+"disponibles."
+
+#: forms/models.py:582
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
@@ -4072,40 +4115,40 @@ msgstr "No se permiten saltos de línea."
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Seleccione una opción válida; '%(data)s' no está en %(choices)s."
-#: oldforms/__init__.py:745
+#: oldforms/__init__.py:754
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Introduzca un número entero entre -32.768 y 32.767."
-#: oldforms/__init__.py:755
+#: oldforms/__init__.py:764
msgid "Enter a positive number."
msgstr "Introduzca un número positivo."
-#: oldforms/__init__.py:765
+#: oldforms/__init__.py:774
msgid "Enter a whole number between 0 and 32,767."
msgstr "Introduzca un número entero entre 0 y 32.767."
-#: template/defaultfilters.py:691
+#: template/defaultfilters.py:698
msgid "yes,no,maybe"
msgstr "si,no,talvez"
-#: template/defaultfilters.py:722
+#: template/defaultfilters.py:729
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:724
+#: template/defaultfilters.py:731
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
-#: template/defaultfilters.py:726
+#: template/defaultfilters.py:733
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
-#: template/defaultfilters.py:727
+#: template/defaultfilters.py:734
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
@@ -4314,7 +4357,7 @@ msgstr "Nov."
msgid "Dec."
msgstr "Dic."
-#: utils/text.py:127
+#: utils/text.py:128
msgid "or"
msgstr "o"
@@ -4368,41 +4411,68 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:399
+#: utils/translation/trans_real.py:412
msgid "DATE_FORMAT"
msgstr "j N Y"
-#: utils/translation/trans_real.py:400
+#: utils/translation/trans_real.py:413
msgid "DATETIME_FORMAT"
msgstr "j N Y P"
-#: utils/translation/trans_real.py:401
+#: utils/translation/trans_real.py:414
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:417
+#: utils/translation/trans_real.py:430
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:418
+#: utils/translation/trans_real.py:431
msgid "MONTH_DAY_FORMAT"
msgstr "j \\de F"
-#: views/generic/create_update.py:43
+#: views/generic/create_update.py:129
#, python-format
msgid "The %(verbose_name)s was created successfully."
msgstr "Se creó con éxito %(verbose_name)s."
-#: views/generic/create_update.py:117
+#: views/generic/create_update.py:172
#, python-format
msgid "The %(verbose_name)s was updated successfully."
msgstr "Se actualizó con éxito %(verbose_name)s."
-#: views/generic/create_update.py:184
+#: views/generic/create_update.py:214
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "Se eliminó %(verbose_name)s."
+#~ msgid "Year must be 1900 or later."
+#~ msgstr "El año debe ser 1900 o posterior."
+
+#~ msgid "Gaeilge"
+#~ msgstr "Irlandés"
+
+#~ msgid "Brazilian"
+#~ msgstr "Brasileño"
+
+#~ msgid "Ordering"
+#~ msgstr "Ordenación"
+
+#~ msgid "Order:"
+#~ msgstr "Orden:"
+
+#~ msgid "Added %s."
+#~ msgstr "Agregado %s."
+
+#~ msgid "Deleted %s."
+#~ msgstr "Eliminó %s."
+
+#~ msgid "The two 'new password' fields didn't match."
+#~ msgstr "Los dos campos 'nueva contraseña' no coinciden entre si."
+
+#~ msgid "Separate multiple IDs with commas."
+#~ msgstr "Separe múltiples identificadores con comas."
+
#~ msgid ""
#~ "Enter a postcode. A space is required between the two postcode parts."
#~ msgstr ""
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 60b760f7a8..7db70d5cd9 100644
Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 3e133e8ca7..7a88f84ec7 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
# translation of django.po to french
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
@@ -1066,7 +1066,7 @@ msgstr "Sélectionnez %s"
#: contrib/admin/views/main.py:583
#, python-format
msgid "Select %s to change"
-msgstr "Sélectionnez %s pour changer"
+msgstr "Sélectionnez l'objet %s à changer"
#: contrib/admin/views/main.py:784
msgid "Database error"
@@ -4093,107 +4093,107 @@ msgstr "midi"
#: utils/dates.py:6
msgid "Monday"
-msgstr "Lundi"
+msgstr "lundi"
#: utils/dates.py:6
msgid "Tuesday"
-msgstr "Mardi"
+msgstr "mardi"
#: utils/dates.py:6
msgid "Wednesday"
-msgstr "Mercredi"
+msgstr "mercredi"
#: utils/dates.py:6
msgid "Thursday"
-msgstr "Jeudi"
+msgstr "jeudi"
#: utils/dates.py:6
msgid "Friday"
-msgstr "Vendredi"
+msgstr "vendredi"
#: utils/dates.py:7
msgid "Saturday"
-msgstr "Samedi"
+msgstr "samedi"
#: utils/dates.py:7
msgid "Sunday"
-msgstr "Dimanche"
+msgstr "dimanche"
#: utils/dates.py:10
msgid "Mon"
-msgstr "Lun"
+msgstr "lun"
#: utils/dates.py:10
msgid "Tue"
-msgstr "Mar"
+msgstr "mar"
#: utils/dates.py:10
msgid "Wed"
-msgstr "Mer"
+msgstr "mer"
#: utils/dates.py:10
msgid "Thu"
-msgstr "Jeu"
+msgstr "jeu"
#: utils/dates.py:10
msgid "Fri"
-msgstr "Ven"
+msgstr "ven"
#: utils/dates.py:11
msgid "Sat"
-msgstr "Sam"
+msgstr "sam"
#: utils/dates.py:11
msgid "Sun"
-msgstr "Dim"
+msgstr "dim"
#: utils/dates.py:18
msgid "January"
-msgstr "Janvier"
+msgstr "janvier"
#: utils/dates.py:18
msgid "February"
-msgstr "Février"
+msgstr "février"
#: utils/dates.py:18 utils/dates.py:31
msgid "March"
-msgstr "Mars"
+msgstr "mars"
#: utils/dates.py:18 utils/dates.py:31
msgid "April"
-msgstr "Avril"
+msgstr "avril"
#: utils/dates.py:18 utils/dates.py:31
msgid "May"
-msgstr "Mai"
+msgstr "mai"
#: utils/dates.py:18 utils/dates.py:31
msgid "June"
-msgstr "Juin"
+msgstr "juin"
#: utils/dates.py:19 utils/dates.py:31
msgid "July"
-msgstr "Juillet"
+msgstr "juillet"
#: utils/dates.py:19
msgid "August"
-msgstr "Août"
+msgstr "août"
#: utils/dates.py:19
msgid "September"
-msgstr "Septembre"
+msgstr "septembre"
#: utils/dates.py:19
msgid "October"
-msgstr "Octobre"
+msgstr "octobre"
#: utils/dates.py:19
msgid "November"
-msgstr "Novembre"
+msgstr "novembre"
#: utils/dates.py:20
msgid "December"
-msgstr "Décembre"
+msgstr "décembre"
#: utils/dates.py:23
msgid "jan"
@@ -4245,31 +4245,31 @@ msgstr "déc"
#: utils/dates.py:31
msgid "Jan."
-msgstr "Jan."
+msgstr "jan."
#: utils/dates.py:31
msgid "Feb."
-msgstr "Fév."
+msgstr "fév."
#: utils/dates.py:32
msgid "Aug."
-msgstr "Août"
+msgstr "août"
#: utils/dates.py:32
msgid "Sept."
-msgstr "Sept."
+msgstr "sept."
#: utils/dates.py:32
msgid "Oct."
-msgstr "Oct."
+msgstr "oct."
#: utils/dates.py:32
msgid "Nov."
-msgstr "Nov."
+msgstr "nov."
#: utils/dates.py:32
msgid "Dec."
-msgstr "Déc."
+msgstr "déc."
#: utils/text.py:127
msgid "or"
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index e96764a0a8..b04a32eed4 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 4e87ad549d..4c08a43929 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -1,13 +1,14 @@
# translation of django.po to Italiano
+# Nicola Larosa , 2008.
# Italian translation of Django.
# Copyright (C) 2006 the Lawrence Journal-World
# This file is distributed under the same license as the Django package.
msgid ""
msgstr ""
-"Project-Id-Version: Django vSVN\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 20:30+0200\n"
-"PO-Revision-Date: 2008-07-12 20:45+0200\n"
+"POT-Creation-Date: 2008-08-04 11:52+0200\n"
+"PO-Revision-Date: 2008-08-04 12:08+0200\n"
"Last-Translator: Nicola Larosa \n"
"Language-Team: Italiano\n"
"MIME-Version: 1.0\n"
@@ -246,49 +247,208 @@ msgstr "Questo mese"
msgid "This year"
msgstr "Quest'anno"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
-#: oldforms/__init__.py:592
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
+#: oldforms/__init__.py:588
msgid "Yes"
msgstr "Sì"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
-#: oldforms/__init__.py:592
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
+#: oldforms/__init__.py:588
msgid "No"
msgstr "No"
-#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
-#: oldforms/__init__.py:592
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:379
+#: oldforms/__init__.py:588
msgid "Unknown"
msgstr "Sconosciuto"
-#: contrib/admin/models.py:18
+#: contrib/admin/models.py:19
msgid "action time"
msgstr "momento dell'azione"
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
msgid "object id"
msgstr "id dell'oggetto"
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
msgid "object repr"
msgstr "rappresentazione dell'oggetto"
-#: contrib/admin/models.py:23
+#: contrib/admin/models.py:24
msgid "action flag"
msgstr "flag di azione"
-#: contrib/admin/models.py:24
+#: contrib/admin/models.py:25
msgid "change message"
msgstr "messaggio di modifica"
-#: contrib/admin/models.py:27
+#: contrib/admin/models.py:28
msgid "log entry"
msgstr "voce di log"
-#: contrib/admin/models.py:28
+#: contrib/admin/models.py:29
msgid "log entries"
msgstr "voci di log"
+#: contrib/admin/options.py:143 contrib/admin/options.py:181
+msgid "None"
+msgstr "Nessuno"
+
+#: contrib/admin/options.py:361 contrib/auth/admin.py:37
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Il %(name)s \"%(obj)s\" è stato aggiunto correttamente."
+
+#: contrib/admin/options.py:365 contrib/admin/options.py:433
+#: contrib/auth/admin.py:42
+msgid "You may edit it again below."
+msgstr "È possibile modificarlo nuovamente qui sotto."
+
+#: contrib/admin/options.py:375 contrib/admin/options.py:442
+#, python-format
+msgid "You may add another %s below."
+msgstr "È possibile aggiungere un altro %s qui sotto."
+
+#: contrib/admin/options.py:409
+#, python-format
+msgid "Changed %s."
+msgstr "%s modificato."
+
+#: contrib/admin/options.py:409 contrib/admin/options.py:419
+#: core/validators.py:279 db/models/manipulators.py:305
+msgid "and"
+msgstr "e"
+
+#: contrib/admin/options.py:414
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "Aggiunti %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:418
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "Cambiati %(list)s per %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:423
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "Cancellati %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:428
+msgid "No fields changed."
+msgstr "Nessun campo modificato."
+
+#: contrib/admin/options.py:431
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Il %(name)s \"%(obj)s\" è stato modificato correttamente."
+
+#: contrib/admin/options.py:439
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"Il %(name)s \"%(obj)s\" è stato aggiunto correttamente. È possibile "
+"modificarlo nuovamente qui sotto."
+
+#: contrib/admin/options.py:520
+#, python-format
+msgid "Add %s"
+msgstr "Aggiungi %s"
+
+#: contrib/admin/options.py:582
+#, python-format
+msgid "Change %s"
+msgstr "Modifica %s"
+
+#: contrib/admin/options.py:612
+msgid "Database error"
+msgstr "Errore nel database"
+
+#: contrib/admin/options.py:661
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Lo %(name)s \"%(obj)s\" è stato cancellato correttamente."
+
+#: contrib/admin/options.py:667
+msgid "Are you sure?"
+msgstr "Sei sicuro?"
+
+#: contrib/admin/options.py:694
+#, python-format
+msgid "Change history: %s"
+msgstr "Tracciato delle modifiche: %s"
+
+#: contrib/admin/sites.py:17 contrib/admin/views/decorators.py:16
+#: contrib/auth/forms.py:72 contrib/comments/views/comments.py:56
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Inserire nome utente e password corretti. Entrambi i campi sono case "
+"sensitive."
+
+#: contrib/admin/sites.py:229 contrib/admin/views/decorators.py:68
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"La sessione è scaduta: occorre accedere nuovamente. I dati inseriti sono "
+"stati comunque salvati."
+
+#: contrib/admin/sites.py:236 contrib/admin/views/decorators.py:75
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Il browser non sembra configurato per accettare i cookie. Una volta "
+"abilitati, ricaricare la pagina e riprovare."
+
+#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
+#: contrib/admin/views/decorators.py:92
+msgid "Usernames cannot contain the '@' character."
+msgstr "I nomi utente non possono contenere il carattere '@'."
+
+#: contrib/admin/sites.py:253 contrib/admin/views/decorators.py:88
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Il nome utente non è costituito dall'indirizzo e-mail. Provare con '%s'."
+
+#: contrib/admin/sites.py:321
+msgid "Site administration"
+msgstr "Amministrazione sito"
+
+#: contrib/admin/sites.py:343 contrib/admin/templates/admin/login.html:27
+#: contrib/admin/templates/registration/password_reset_complete.html:14
+#: contrib/admin/views/decorators.py:30
+msgid "Log in"
+msgstr "Accedi"
+
+#: contrib/admin/util.py:126
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Uno o più %(fieldname)s in %(name)s: %(obj)s"
+
+#: contrib/admin/util.py:131
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Uno o più %(fieldname)s in %(name)s:"
+
+#: contrib/admin/widgets.py:65
+msgid "Date:"
+msgstr "Data:"
+
+#: contrib/admin/widgets.py:65
+msgid "Time:"
+msgstr "Ora:"
+
+#: contrib/admin/widgets.py:89
+msgid "Currently:"
+msgstr "Attualmente:"
+
+#: contrib/admin/widgets.py:89
+msgid "Change:"
+msgstr "Modifica:"
+
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
msgid "Page not found"
@@ -299,17 +459,19 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Spiacenti, ma la pagina richiesta non è stata trovata."
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:37
-#: contrib/admin/templates/admin/change_form.html:12
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:4
-#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_reset_complete.html:4
+#: contrib/admin/templates/registration/password_reset_confirm.html:4
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
msgid "Home"
@@ -335,22 +497,28 @@ msgstr ""
"Si è verificato un errore. È stato riportato agli amministratori del sito "
"via e-mail e verrà corretto a breve. Grazie per la tua pazienza."
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:25
msgid "Welcome,"
msgstr "Benvenuto,"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:25
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Documentation"
msgstr "Documentazione"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:45
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:13
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Change password"
msgstr "Cambia la password"
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/comments/templates/comments/form.html:6
msgid "Log out"
msgstr "Esci"
@@ -363,46 +531,43 @@ msgstr "Amministrazione sito Django"
msgid "Django administration"
msgstr "Amministrazione Django"
-#: contrib/admin/templates/admin/change_form.html:14
-#: contrib/admin/templates/admin/index.html:28
+#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/index.html:29
msgid "Add"
msgstr "Aggiungi"
-#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/change_form.html:26
+#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Storia"
-#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/change_form.html:27
msgid "View on site"
msgstr "Vedi sul sito"
-#: contrib/admin/templates/admin/change_form.html:31
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:37
+#: contrib/admin/templates/admin/auth/user/change_password.html:22
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Correggere l'errore qui sotto."
msgstr[1] "Correggere gli errori qui sotto."
-#: contrib/admin/templates/admin/change_form.html:49
-msgid "Ordering"
-msgstr "Ordinamento"
-
-#: contrib/admin/templates/admin/change_form.html:52
-msgid "Order:"
-msgstr "Ordine:"
-
-#: contrib/admin/templates/admin/change_list.html:11
+#: contrib/admin/templates/admin/change_list.html:16
#, python-format
msgid "Add %(name)s"
msgstr "Aggiungi %(name)s"
-#: contrib/admin/templates/admin/delete_confirmation.html:8
+#: contrib/admin/templates/admin/change_list.html:26
+msgid "Filter"
+msgstr "Filtro"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:9
#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
msgid "Delete"
msgstr "Cancella"
-#: contrib/admin/templates/admin/delete_confirmation.html:13
+#: contrib/admin/templates/admin/delete_confirmation.html:15
#, python-format
msgid ""
"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -413,7 +578,7 @@ msgstr ""
"cancellazione di oggetti collegati, ma questo account non ha i permessi per "
"cancellare gli oggetti dei seguenti tipi:"
-#: contrib/admin/templates/admin/delete_confirmation.html:20
+#: contrib/admin/templates/admin/delete_confirmation.html:22
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -422,7 +587,7 @@ msgstr ""
"Sei sicuro di voler cancellare gli %(object_name)s \"%(escaped_object)s\"? "
"Tutti i seguenti oggetti collegati saranno cancellati:"
-#: contrib/admin/templates/admin/delete_confirmation.html:25
+#: contrib/admin/templates/admin/delete_confirmation.html:27
msgid "Yes, I'm sure"
msgstr "Sì, sono sicuro"
@@ -431,41 +596,37 @@ msgstr "Sì, sono sicuro"
msgid " By %(filter_title)s "
msgstr " Per %(filter_title)s "
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filtro"
-
-#: contrib/admin/templates/admin/index.html:17
+#: contrib/admin/templates/admin/index.html:18
#, python-format
msgid "Models available in the %(name)s application."
msgstr "Modelli disponibili nell'applicazione %(name)s."
-#: contrib/admin/templates/admin/index.html:18
+#: contrib/admin/templates/admin/index.html:19
#, python-format
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/index.html:34
+#: contrib/admin/templates/admin/index.html:35
msgid "Change"
msgstr "Modifica"
-#: contrib/admin/templates/admin/index.html:44
+#: contrib/admin/templates/admin/index.html:45
msgid "You don't have permission to edit anything."
msgstr "Non hai i privilegi per modificare alcunché."
-#: contrib/admin/templates/admin/index.html:52
+#: contrib/admin/templates/admin/index.html:53
msgid "Recent Actions"
msgstr "Azioni Recenti"
-#: contrib/admin/templates/admin/index.html:53
+#: contrib/admin/templates/admin/index.html:54
msgid "My Actions"
msgstr "Azioni Proprie"
-#: contrib/admin/templates/admin/index.html:57
+#: contrib/admin/templates/admin/index.html:58
msgid "None available"
msgstr "Nessuno disponibile"
-#: contrib/admin/templates/admin/invalid_setup.html:8
+#: 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 "
@@ -475,39 +636,34 @@ msgstr ""
"appropriate del database siano state create, e che il database sia leggibile "
"dall'utente appropriato."
-#: contrib/admin/templates/admin/login.html:17
+#: contrib/admin/templates/admin/login.html:19
#: contrib/comments/templates/comments/form.html:6
#: contrib/comments/templates/comments/form.html:8
msgid "Username:"
msgstr "Nome utente:"
-#: contrib/admin/templates/admin/login.html:20
+#: contrib/admin/templates/admin/login.html:22
#: contrib/comments/templates/comments/form.html:8
msgid "Password:"
msgstr "Password:"
-#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:31
-msgid "Log in"
-msgstr "Accedi"
-
-#: contrib/admin/templates/admin/object_history.html:17
+#: contrib/admin/templates/admin/object_history.html:16
msgid "Date/time"
msgstr "Data/ora"
-#: contrib/admin/templates/admin/object_history.html:18
+#: contrib/admin/templates/admin/object_history.html:17
msgid "User"
msgstr "Utente"
-#: contrib/admin/templates/admin/object_history.html:19
+#: contrib/admin/templates/admin/object_history.html:18
msgid "Action"
msgstr "Azione"
-#: contrib/admin/templates/admin/object_history.html:25
+#: contrib/admin/templates/admin/object_history.html:24
msgid "DATE_WITH_TIME_FULL"
msgstr "j F Y, H:i"
-#: contrib/admin/templates/admin/object_history.html:35
+#: contrib/admin/templates/admin/object_history.html:32
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
@@ -559,26 +715,29 @@ msgstr ""
"Inserire innanzitutto nome utente e password. Si potrà quindi modificare le "
"altre impostazioni dell'utente."
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
+#: contrib/admin/templates/admin/auth/user/add_form.html:13
+#: contrib/auth/forms.py:14 contrib/auth/forms.py:51
msgid "Username"
msgstr "Nome utente"
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: 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:52 contrib/auth/forms.py:176
msgid "Password"
msgstr "Password"
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:38
+#: contrib/admin/templates/admin/auth/user/add_form.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/auth/forms.py:177
msgid "Password (again)"
msgstr "Password (di nuovo)"
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: 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 "Inserire la stessa password inserita sopra, come verifica."
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:26
#, python-format
msgid "Enter a new password for the user %(username)s."
msgstr "Inserire una nuova password per l'utente %(username)s."
@@ -663,23 +822,23 @@ msgstr "Grazie per aver speso il tuo tempo prezioso su questo sito oggi."
msgid "Log in again"
msgstr "Accedi di nuovo"
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_form.html:5
-#: contrib/admin/templates/registration/password_change_form.html:9
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
msgid "Password change"
msgstr "Cambio password"
-#: contrib/admin/templates/registration/password_change_done.html:5
-#: contrib/admin/templates/registration/password_change_done.html:9
+#: 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"
-#: contrib/admin/templates/registration/password_change_done.html:11
+#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
msgstr "La password è stata cambiata."
-#: contrib/admin/templates/registration/password_change_form.html:11
+#: 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."
@@ -687,22 +846,27 @@ msgstr ""
"Inserire la password attuale, per ragioni di sicurezza, e poi la nuova "
"password due volte, per verificare di averla scritta correttamente."
-#: contrib/admin/templates/registration/password_change_form.html:16
+#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
msgstr "Password attuale:"
-#: contrib/admin/templates/registration/password_change_form.html:18
+#: contrib/admin/templates/registration/password_change_form.html:19
+#: contrib/admin/templates/registration/password_reset_confirm.html:18
msgid "New password:"
msgstr "Nuova password:"
-#: contrib/admin/templates/registration/password_change_form.html:20
+#: contrib/admin/templates/registration/password_change_form.html:21
+#: contrib/admin/templates/registration/password_reset_confirm.html:20
msgid "Confirm password:"
msgstr "Confermare la password:"
-#: contrib/admin/templates/registration/password_change_form.html:22
+#: contrib/admin/templates/registration/password_change_form.html:23
+#: contrib/admin/templates/registration/password_reset_confirm.html:21
msgid "Change my password"
msgstr "Modifica la mia password"
+#: contrib/admin/templates/registration/password_reset_complete.html:4
+#: contrib/admin/templates/registration/password_reset_confirm.html:6
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/password_reset_form.html:6
@@ -710,6 +874,39 @@ msgstr "Modifica la mia password"
msgid "Password reset"
msgstr "Reimposta la password"
+#: contrib/admin/templates/registration/password_reset_complete.html:6
+#: contrib/admin/templates/registration/password_reset_complete.html:10
+msgid "Password reset complete"
+msgstr "Password reimpostata"
+
+#: contrib/admin/templates/registration/password_reset_complete.html:12
+msgid "Your password has been set. You may go ahead and log in now."
+msgstr "La tua password è stata impostata. Ora puoi effettuare l'accesso."
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:4
+msgid "Password reset confirmation"
+msgstr "Conferma reimpostazione password"
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:12
+msgid "Enter new password"
+msgstr "Inserisci la nuova password"
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:14
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr "Inserire la nuova password due volte, per verificare di averla scritta correttamente."
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:26
+msgid "Password reset unsuccessful"
+msgstr "Password NON reimpostata"
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:28
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used. Please request a new password reset."
+msgstr "Il link per la reimpostazione della password non era valido, forse perché era già stato usato. Richiedi una nuova reimpostazione della password."
+
#: contrib/admin/templates/registration/password_reset_done.html:6
#: contrib/admin/templates/registration/password_reset_done.html:10
msgid "Password reset successful"
@@ -717,11 +914,9 @@ msgstr "Password reimpostata correttamente"
#: contrib/admin/templates/registration/password_reset_done.html:12
msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"La nuova password è stata inviata all'indirizzo e-mail inserito. Arriverà a "
-"breve."
+"We've e-mailed you instructions for setting your password to the e-mail "
+"address you submitted. You should be receiving it shortly."
+msgstr "Abbiamo inviato le istruzioni per impostare la tua password all'indirizzo e-mail inserito. Arriverà a breve."
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
@@ -733,34 +928,27 @@ msgid "for your user account at %(site_name)s"
msgstr "per il tuo account utente su %(site_name)s"
#: contrib/admin/templates/registration/password_reset_email.html:5
-#, python-format
-msgid "Your new password is: %(new_password)s"
-msgstr "La tua nuova password è: %(new_password)s"
+msgid "Please go to the following page and choose a new password:"
+msgstr "Vai alla pagina seguente e scegli una nuova password:"
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-msgstr "Puoi liberamente cambiare la tua password tramite questa pagina:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:11
+#: 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:"
-#: contrib/admin/templates/registration/password_reset_email.html:13
+#: contrib/admin/templates/registration/password_reset_email.html:11
msgid "Thanks for using our site!"
msgstr "Grazie per aver usato il nostro sito!"
-#: contrib/admin/templates/registration/password_reset_email.html:15
+#: contrib/admin/templates/registration/password_reset_email.html:13
#, python-format
msgid "The %(site_name)s team"
msgstr "Il team di %(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 reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"Dimenticata la password? Inserire il proprio indirizzo e-mail qui sotto: la "
-"password sarà reimpostata, e la nuova ti verrà inviata per e-mail."
+"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 invieremo per email le istruzioni per impostarne una nuova."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -770,325 +958,210 @@ msgstr "Indirizzo e-mail:"
msgid "Reset my password"
msgstr "Reimposta la mia password"
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Data:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Ora:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Attualmente:"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Modifica:"
-
#: contrib/admin/templatetags/admin_list.py:257
msgid "All dates"
msgstr "Tutte le date"
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
+#: contrib/admin/views/main.py:65
#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Il %(name)s \"%(obj)s\" è stato aggiunto correttamente."
-
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
-#: contrib/admin/views/main.py:356
-msgid "You may edit it again below."
-msgstr "È possibile modificarlo nuovamente qui sotto."
-
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr "Aggiungi utente"
-
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
-msgstr "La password è stata cambiata correttamente."
-
-#: contrib/admin/views/auth.py:65
-#, python-format
-msgid "Change password: %s"
-msgstr "Cambia la password: %s"
-
-#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Inserire nome utente e password corretti. Entrambi i campi sono case "
-"sensitive."
-
-#: contrib/admin/views/decorators.py:69
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"La sessione è scaduta: occorre accedere nuovamente. I dati inseriti sono "
-"stati comunque salvati."
-
-#: contrib/admin/views/decorators.py:76
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"Il browser non sembra configurato per accettare i cookie. Una volta "
-"abilitati, ricaricare la pagina e riprovare."
+msgid "Select %s"
+msgstr "Scegli %s"
-#: contrib/admin/views/decorators.py:89
+#: contrib/admin/views/main.py:65
#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Il nome utente non è costituito dall'indirizzo e-mail. Provare con '%s'."
-
-#: contrib/admin/views/decorators.py:93
-msgid "Usernames cannot contain the '@' character."
-msgstr "I nomi utente non possono contenere il carattere '@'."
+msgid "Select %s to change"
+msgstr "Scegli %s da modificare"
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
-#: contrib/admin/views/doc.py:52
+#: contrib/admindocs/views.py:53 contrib/admindocs/views.py:55
+#: contrib/admindocs/views.py:57
msgid "tag:"
msgstr "tag:"
-#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
-#: contrib/admin/views/doc.py:83
+#: contrib/admindocs/views.py:87 contrib/admindocs/views.py:89
+#: contrib/admindocs/views.py:91
msgid "filter:"
msgstr "filtro:"
-#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
-#: contrib/admin/views/doc.py:141
+#: contrib/admindocs/views.py:153 contrib/admindocs/views.py:155
+#: contrib/admindocs/views.py:157
msgid "view:"
msgstr "view:"
-#: contrib/admin/views/doc.py:166
+#: contrib/admindocs/views.py:187
#, python-format
msgid "App %r not found"
msgstr "Appl. %r non trovata"
-#: contrib/admin/views/doc.py:173
+#: contrib/admindocs/views.py:194
#, python-format
-msgid "Model %(name)r not found in app %(label)r"
-msgstr "Modello %(name)r non trovato nell'appl. %(label)r"
+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/admin/views/doc.py:185
+#: contrib/admindocs/views.py:206
#, python-format
-msgid "the related `%(label)s.%(type)s` object"
-msgstr "l'oggetto `%(label)s.%(type)s` collegato"
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "l'oggetto `%(app_label)s.%(data_type)s` collegato"
-#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
-#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
msgid "model:"
msgstr "modello:"
-#: contrib/admin/views/doc.py:216
+#: contrib/admindocs/views.py:237
#, python-format
-msgid "related `%(label)s.%(name)s` objects"
-msgstr "oggetti `%(label)s.%(name)s` collegati"
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "oggetti `%(app_label)s.%(object_name)s` collegati"
-#: contrib/admin/views/doc.py:221
+#: contrib/admindocs/views.py:242
#, python-format
msgid "all %s"
msgstr "tutti %s"
-#: contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:247
#, python-format
msgid "number of %s"
msgstr "numero di %s"
-#: contrib/admin/views/doc.py:231
+#: contrib/admindocs/views.py:253
#, python-format
msgid "Fields on %s objects"
msgstr "Campi sugli oggetti %s"
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
-#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
-#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
+#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:328
+#: contrib/admindocs/views.py:330 contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:337 contrib/admindocs/views.py:339
msgid "Integer"
msgstr "Intero"
-#: contrib/admin/views/doc.py:294
+#: contrib/admindocs/views.py:318
msgid "Boolean (Either True or False)"
msgstr "Booleano (True o False)"
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
+#: contrib/admindocs/views.py:319 contrib/admindocs/views.py:338
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Stringa (fino a %(max_length)s)"
-#: contrib/admin/views/doc.py:296
+#: contrib/admindocs/views.py:320
msgid "Comma-separated integers"
msgstr "Interi separati da virgola"
-#: contrib/admin/views/doc.py:297
+#: contrib/admindocs/views.py:321
msgid "Date (without time)"
msgstr "Data (senza ora)"
-#: contrib/admin/views/doc.py:298
+#: contrib/admindocs/views.py:322
msgid "Date (with time)"
msgstr "Data (con ora)"
-#: contrib/admin/views/doc.py:299
+#: contrib/admindocs/views.py:323
msgid "Decimal number"
msgstr "Numero decimale"
-#: contrib/admin/views/doc.py:300
+#: contrib/admindocs/views.py:324
msgid "E-mail address"
msgstr "Indirizzo e-mail"
-#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
-#: contrib/admin/views/doc.py:305
+#: contrib/admindocs/views.py:325 contrib/admindocs/views.py:326
+#: contrib/admindocs/views.py:329
msgid "File path"
msgstr "Percorso di file"
-#: contrib/admin/views/doc.py:303
+#: contrib/admindocs/views.py:327
msgid "Floating point number"
msgstr "Numero decimale"
-#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89
+#: contrib/admindocs/views.py:331 contrib/comments/models.py:89
msgid "IP address"
msgstr "indirizzo IP"
-#: contrib/admin/views/doc.py:309
+#: contrib/admindocs/views.py:333
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (True, False o None)"
-#: contrib/admin/views/doc.py:310
+#: contrib/admindocs/views.py:334
msgid "Relation to parent model"
msgstr "Collegamento a modello padre"
-#: contrib/admin/views/doc.py:311
+#: contrib/admindocs/views.py:335
msgid "Phone number"
msgstr "Numero di telefono"
-#: contrib/admin/views/doc.py:316
+#: contrib/admindocs/views.py:340
msgid "Text"
msgstr "Testo"
-#: contrib/admin/views/doc.py:317
+#: contrib/admindocs/views.py:341
msgid "Time"
msgstr "Ora"
-#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:8
+#: contrib/admindocs/views.py:342 contrib/flatpages/models.py:8
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:319
+#: contrib/admindocs/views.py:343
msgid "U.S. state (two uppercase letters)"
msgstr "Stato USA (due lettere maiuscole)"
-#: contrib/admin/views/doc.py:320
+#: contrib/admindocs/views.py:344
msgid "XML text"
msgstr "Testo XML"
-#: contrib/admin/views/doc.py:346
+#: contrib/admindocs/views.py:370
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s non sembra essere un oggetto urlpattern"
-#: contrib/admin/views/main.py:233
-msgid "Site administration"
-msgstr "Amministrazione sito"
-
-#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
-#, python-format
-msgid "You may add another %s below."
-msgstr "È possibile aggiungere un altro %s qui sotto."
-
-#: contrib/admin/views/main.py:298
-#, python-format
-msgid "Add %s"
-msgstr "Aggiungi %s"
-
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Added %s."
-msgstr "%s aggiunto."
-
-#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
-#: contrib/admin/views/main.py:348 core/validators.py:283
-#: db/models/manipulators.py:309
-msgid "and"
-msgstr "e"
+#: contrib/auth/admin.py:17
+msgid "Personal info"
+msgstr "Informazioni personali"
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Changed %s."
-msgstr "%s modificato."
+#: contrib/auth/admin.py:18
+msgid "Permissions"
+msgstr "Permessi"
-#: contrib/admin/views/main.py:348
-#, python-format
-msgid "Deleted %s."
-msgstr "%s cancellato."
+#: contrib/auth/admin.py:19
+msgid "Important dates"
+msgstr "Date importanti"
-#: contrib/admin/views/main.py:351
-msgid "No fields changed."
-msgstr "Nessun campo modificato."
+#: contrib/auth/admin.py:20
+msgid "Groups"
+msgstr "Gruppi"
-#: contrib/admin/views/main.py:354
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Il %(name)s \"%(obj)s\" è stato modificato correttamente."
+#: contrib/auth/admin.py:47
+msgid "Add user"
+msgstr "Aggiungi utente"
-#: contrib/admin/views/main.py:362
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+#: contrib/auth/forms.py:15 contrib/auth/models.py:134
+msgid ""
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
+"digits and underscores)."
msgstr ""
-"Il %(name)s \"%(obj)s\" è stato aggiunto correttamente. È possibile "
-"modificarlo nuovamente qui sotto."
-
-#: contrib/admin/views/main.py:400
-#, python-format
-msgid "Change %s"
-msgstr "Modifica %s"
-
-#: contrib/admin/views/main.py:487
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Uno o più %(fieldname)s in %(name)s: %(obj)s"
-
-#: contrib/admin/views/main.py:492
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Uno o più %(fieldname)s in %(name)s:"
-
-#: contrib/admin/views/main.py:524
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "Lo %(name)s \"%(obj)s\" è stato cancellato correttamente."
-
-#: contrib/admin/views/main.py:527
-msgid "Are you sure?"
-msgstr "Sei sicuro?"
-
-#: contrib/admin/views/main.py:549
-#, python-format
-msgid "Change history: %s"
-msgstr "Tracciato delle modifiche: %s"
+"Obbligatorio. 30 caratteri o meno. Solo caratteri alfanumerici (lettere, "
+"cifre e sottolineati)."
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s"
-msgstr "Scegli %s"
+#: contrib/auth/forms.py:16 core/validators.py:72
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Questo valore può contenere solo lettere, cifre e sottolineati."
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s to change"
-msgstr "Scegli %s da modificare"
+#: contrib/auth/forms.py:18
+msgid "Password confirmation"
+msgstr "Conferma password"
-#: contrib/admin/views/main.py:765
-msgid "Database error"
-msgstr "Errore nel database"
+#: contrib/auth/forms.py:30
+msgid "A user with that username already exists."
+msgstr "Un utente con questo nome·è già presente."
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
+#: contrib/auth/forms.py:36 contrib/auth/forms.py:146
+#: contrib/auth/forms.py:188
msgid "The two password fields didn't match."
msgstr "I due campi password non corrispondono."
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "Un utente con questo nome·è già presente."
+#: contrib/auth/forms.py:74 contrib/comments/views/comments.py:58
+msgid "This account is inactive."
+msgstr "Questo account non è attivo."
-#: contrib/auth/forms.py:53
+#: contrib/auth/forms.py:79 contrib/comments/views/comments.py:49
msgid ""
"Your Web browser doesn't appear to have cookies enabled. Cookies are "
"required for logging in."
@@ -1096,11 +1169,11 @@ msgstr ""
"Il browser web sembra non avere i cookie abilitati. I cookie sono necessari "
"per poter accedere."
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
-msgstr "Questo account non è attivo."
+#: contrib/auth/forms.py:92
+msgid "E-mail"
+msgstr "E-mail"
-#: contrib/auth/forms.py:84
+#: contrib/auth/forms.py:101
msgid ""
"That e-mail address doesn't have an associated user account. Are you sure "
"you've registered?"
@@ -1108,16 +1181,24 @@ msgstr ""
"Questo indirizzo email non è associato ad alcun account utente. Sei sicuro "
"di esserti registrato?"
-#: contrib/auth/forms.py:107
+#: contrib/auth/forms.py:126
#, python-format
msgid "Password reset on %s"
msgstr "Password reimpostata su %s"
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr "I due campi 'nuova password' non corrispondono."
+#: contrib/auth/forms.py:134
+msgid "New password"
+msgstr "Nuova password"
-#: contrib/auth/forms.py:124
+#: contrib/auth/forms.py:135
+msgid "New password confirmation"
+msgstr "Conferma nuova password"
+
+#: contrib/auth/forms.py:160
+msgid "Old password"
+msgstr "Password attuale"
+
+#: contrib/auth/forms.py:168
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr "La password attuale non è stata inserita correttamente: va inserita di nuovo."
@@ -1141,39 +1222,31 @@ msgstr "permessi"
msgid "group"
msgstr "gruppo"
-#: contrib/auth/models.py:98 contrib/auth/models.py:148
+#: contrib/auth/models.py:98 contrib/auth/models.py:144
msgid "groups"
msgstr "gruppi"
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:134
msgid "username"
msgstr "nome utente"
-#: contrib/auth/models.py:138
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
-msgstr ""
-"Obbligatorio. 30 caratteri o meno. Solo caratteri alfanumerici (lettere, "
-"cifre e sottolineati)."
-
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:135
msgid "first name"
msgstr "nome"
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:136
msgid "last name"
msgstr "cognome"
-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:137
msgid "e-mail address"
msgstr "indirizzo e-mail"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:138
msgid "password"
msgstr "password"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:138
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the change "
"password form."
@@ -1181,31 +1254,31 @@ msgstr ""
"Usare '[algo]$[salt]$[hexdigest]' oppure la maschera "
"di cambio password."
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:139
msgid "staff status"
msgstr "privilegi di staff"
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:139
msgid "Designates whether the user can log into this admin site."
msgstr "Indica se l'utente può accedere a questo sito di amministrazione."
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:140
msgid "active"
msgstr "attivo"
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:140
msgid ""
"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
msgstr ""
-"Indica se l'utente debba essere considerato attivo. Deselezionare "
-"qui, piuttosto che cancellare gli account."
+"Indica se l'utente debba essere considerato attivo. Deselezionare qui, "
+"piuttosto che cancellare gli account."
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:141
msgid "superuser status"
msgstr "privilegi di superutente"
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:141
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
@@ -1213,15 +1286,15 @@ msgstr ""
"Indica che l'utente ha tutti i privilegi, senza che siano stati assegnati "
"esplicitamente."
-#: contrib/auth/models.py:146
+#: contrib/auth/models.py:142
msgid "last login"
msgstr "ultimo accesso"
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:143
msgid "date joined"
msgstr "iscritto in data"
-#: contrib/auth/models.py:149
+#: contrib/auth/models.py:145
msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
@@ -1229,43 +1302,36 @@ msgstr ""
"In aggiunta ai privilegi assegnati manualmente, l'utente riceverà anche "
"tutti i privilegi assegnati ad ogni gruppo cui appartiene."
-#: contrib/auth/models.py:150
+#: contrib/auth/models.py:146
msgid "user permissions"
msgstr "privilegi utente"
-#: contrib/auth/models.py:154
+#: contrib/auth/models.py:150
msgid "user"
msgstr "utente"
-#: contrib/auth/models.py:155
+#: contrib/auth/models.py:151
msgid "users"
msgstr "utenti"
-#: contrib/auth/models.py:160
-msgid "Personal info"
-msgstr "Informazioni personali"
-
-#: contrib/auth/models.py:161
-msgid "Permissions"
-msgstr "Permessi"
-
-#: contrib/auth/models.py:162
-msgid "Important dates"
-msgstr "Date importanti"
-
-#: contrib/auth/models.py:163
-msgid "Groups"
-msgstr "Gruppi"
-
-#: contrib/auth/models.py:323
+#: contrib/auth/models.py:306
msgid "message"
msgstr "messaggio"
-#: contrib/auth/views.py:49
+#: contrib/auth/views.py:51
msgid "Logged out"
msgstr "Accesso annullato"
-#: contrib/comments/models.py:71 contrib/comments/models.py:176
+#: contrib/auth/views.py:162
+msgid "Password changed successfully."
+msgstr "La password è stata cambiata correttamente."
+
+#: contrib/auth/views.py:168
+#, python-format
+msgid "Change password: %s"
+msgstr "Cambia la password: %s"
+
+#: contrib/comments/models.py:71 contrib/comments/models.py:164
msgid "object ID"
msgstr "ID dell'oggetto"
@@ -1274,7 +1340,7 @@ msgid "headline"
msgstr "intestazione"
#: contrib/comments/models.py:73 contrib/comments/models.py:95
-#: contrib/comments/models.py:177
+#: contrib/comments/models.py:165
msgid "comment"
msgstr "commento"
@@ -1314,11 +1380,11 @@ msgstr "valutazione #8"
msgid "is valid rating"
msgstr "è una valutazione valida"
-#: contrib/comments/models.py:87 contrib/comments/models.py:179
+#: contrib/comments/models.py:87 contrib/comments/models.py:167
msgid "date/time submitted"
msgstr "data/ora di inserimento"
-#: contrib/comments/models.py:88 contrib/comments/models.py:180
+#: contrib/comments/models.py:88 contrib/comments/models.py:168
msgid "is public"
msgstr "è pubblico"
@@ -1338,11 +1404,11 @@ msgstr ""
msgid "comments"
msgstr "commenti"
-#: contrib/comments/models.py:140 contrib/comments/models.py:222
+#: contrib/comments/models.py:128 contrib/comments/models.py:199
msgid "Content object"
msgstr "Oggetto con contenuto"
-#: contrib/comments/models.py:168
+#: contrib/comments/models.py:156
#, python-format
msgid ""
"Posted by %(user)s at %(date)s\n"
@@ -1357,48 +1423,48 @@ msgstr ""
"\n"
"http://%(domain)s%(url)s"
-#: contrib/comments/models.py:178
+#: contrib/comments/models.py:166
msgid "person's name"
msgstr "nome della persona"
-#: contrib/comments/models.py:181
+#: contrib/comments/models.py:169
msgid "ip address"
msgstr "indirizzo IP"
-#: contrib/comments/models.py:183
+#: contrib/comments/models.py:171
msgid "approved by staff"
msgstr "approvato dallo staff"
-#: contrib/comments/models.py:187
+#: contrib/comments/models.py:175
msgid "free comment"
msgstr "commento libero"
-#: contrib/comments/models.py:188
+#: contrib/comments/models.py:176
msgid "free comments"
msgstr "commenti liberi"
-#: contrib/comments/models.py:250
+#: contrib/comments/models.py:227
msgid "score"
msgstr "punteggio"
-#: contrib/comments/models.py:251
+#: contrib/comments/models.py:228
msgid "score date"
msgstr "data punteggio"
-#: contrib/comments/models.py:255
+#: contrib/comments/models.py:232
msgid "karma score"
msgstr "livello karma"
-#: contrib/comments/models.py:256
+#: contrib/comments/models.py:233
msgid "karma scores"
msgstr "livelli karma"
-#: contrib/comments/models.py:260
+#: contrib/comments/models.py:237
#, python-format
msgid "%(score)d rating by %(user)s"
msgstr "valutazione: %(score)d da %(user)s"
-#: contrib/comments/models.py:277
+#: contrib/comments/models.py:254
#, python-format
msgid ""
"This comment was flagged by %(user)s:\n"
@@ -1409,36 +1475,36 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/models.py:285
+#: contrib/comments/models.py:262
msgid "flag date"
msgstr "data flag"
-#: contrib/comments/models.py:289
+#: contrib/comments/models.py:266
msgid "user flag"
msgstr "flag utente"
-#: contrib/comments/models.py:290
+#: contrib/comments/models.py:267
msgid "user flags"
msgstr "flag utente"
-#: contrib/comments/models.py:294
+#: contrib/comments/models.py:271
#, python-format
msgid "Flag by %r"
msgstr "Flag da %r"
-#: contrib/comments/models.py:300
+#: contrib/comments/models.py:277
msgid "deletion date"
msgstr "data cancellazione"
-#: contrib/comments/models.py:303
+#: contrib/comments/models.py:280
msgid "moderator deletion"
msgstr "cancellazione da moderatore"
-#: contrib/comments/models.py:304
+#: contrib/comments/models.py:281
msgid "moderator deletions"
msgstr "cancellazioni da moderatore"
-#: contrib/comments/models.py:308
+#: contrib/comments/models.py:285
#, python-format
msgid "Moderator deletion by %r"
msgstr "Cancellazione da moderatore %r"
@@ -1479,13 +1545,13 @@ msgstr "Anteprima commento"
msgid "Your name:"
msgstr "Il tuo nome:"
-#: contrib/comments/views/comments.py:28
+#: contrib/comments/views/comments.py:76
msgid "This rating is required because you've entered at least one other rating."
msgstr ""
"Questa valutazione è obbligatoria perché hai inserito almeno un'altra "
"valutazione."
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:160
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
@@ -1508,7 +1574,7 @@ msgstr[1] ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:117
+#: contrib/comments/views/comments.py:165
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -1519,23 +1585,23 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:190
-#: contrib/comments/views/comments.py:283
+#: contrib/comments/views/comments.py:238
+#: contrib/comments/views/comments.py:331
msgid "Only POSTs are allowed"
msgstr "Sono ammessi solo POST"
-#: contrib/comments/views/comments.py:194
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:242
+#: contrib/comments/views/comments.py:335
msgid "One or more of the required fields wasn't submitted"
msgstr "Uno o più campi richiesti non sono stati inseriti"
-#: contrib/comments/views/comments.py:198
-#: contrib/comments/views/comments.py:289
+#: contrib/comments/views/comments.py:246
+#: contrib/comments/views/comments.py:337
msgid "Somebody tampered with the comment form (security violation)"
msgstr "Qualcuno ha alterato il modulo di commento (violazione di sicurezza)"
-#: contrib/comments/views/comments.py:208
-#: contrib/comments/views/comments.py:295
+#: contrib/comments/views/comments.py:256
+#: contrib/comments/views/comments.py:343
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
@@ -1543,8 +1609,8 @@ msgstr ""
"Il modulo di commento ha un parametro 'target' non valido -- l'ID "
"dell'oggetto non è valido"
-#: contrib/comments/views/comments.py:259
-#: contrib/comments/views/comments.py:324
+#: contrib/comments/views/comments.py:307
+#: contrib/comments/views/comments.py:372
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr "Il modulo di commento non fornisce né 'anteprima' né 'invia'"
@@ -1572,6 +1638,10 @@ msgstr "content type"
msgid "content types"
msgstr "content type"
+#: contrib/flatpages/admin.py:9
+msgid "Advanced options"
+msgstr "Opzioni avanzate"
+
#: contrib/flatpages/models.py:9
msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
@@ -1620,10 +1690,6 @@ msgstr "pagina statica"
msgid "flat pages"
msgstr "pagine statiche"
-#: contrib/flatpages/models.py:27
-msgid "Advanced options"
-msgstr "Opzioni avanzate"
-
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "º"
@@ -1731,6 +1797,51 @@ msgstr "Inserire un CUIT valido nel formato XX-XXXXXXXX-X o XXXXXXXXXXXX."
msgid "Invalid CUIT."
msgstr "CUIT non valido."
+#: contrib/localflavor/at/at_states.py:5
+msgid "Burgenland"
+msgstr "Burgenland"
+
+#: contrib/localflavor/at/at_states.py:6
+msgid "Carinthia"
+msgstr "Carinthia"
+
+#: contrib/localflavor/at/at_states.py:7
+msgid "Lower Austria"
+msgstr "Bassa Austria"
+
+#: contrib/localflavor/at/at_states.py:8
+msgid "Upper Austria"
+msgstr "Alta Austria"
+
+#: contrib/localflavor/at/at_states.py:9
+msgid "Salzburg"
+msgstr "Salisburgo"
+
+#: contrib/localflavor/at/at_states.py:10
+msgid "Styria"
+msgstr "Styria"
+
+#: contrib/localflavor/at/at_states.py:11
+msgid "Tyrol"
+msgstr "Tirolo"
+
+#: contrib/localflavor/at/at_states.py:12
+msgid "Vorarlberg"
+msgstr "Vorarlberg"
+
+#: contrib/localflavor/at/at_states.py:13
+msgid "Vienna"
+msgstr "Vienna"
+
+#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16
+#: contrib/localflavor/no/forms.py:12
+msgid "Enter a zip code in the format XXXX."
+msgstr "Inserire un codice postale nel formato XXXXX ."
+
+#: contrib/localflavor/at/forms.py:48
+msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
+msgstr "Inserire un Numero di Assistenza Sociale Austriaco valido, nel formato XXXX XXXXXX."
+
#: contrib/localflavor/au/forms.py:16
msgid "Enter a 4 digit post code."
msgstr "Inserire un codice postale di 4 cifre."
@@ -1881,10 +1992,6 @@ msgstr "Zug"
msgid "Zurich"
msgstr "Zurigo"
-#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12
-msgid "Enter a zip code in the format XXXX."
-msgstr "Inserire un codice postale nel formato XXXXX ."
-
#: contrib/localflavor/ch/forms.py:64
msgid ""
"Enter a valid Swiss identity or passport card number in X1234567<0 or "
@@ -2809,6 +2916,26 @@ msgstr "Polonia Maggiore"
msgid "West Pomerania"
msgstr "Pomerania Ovest"
+#: contrib/localflavor/ro/forms.py:19
+msgid "Enter a valid CIF."
+msgstr "Inserire un codice CIF valido."
+
+#: contrib/localflavor/ro/forms.py:56
+msgid "Enter a valid CNP."
+msgstr "Inserire un codice CNP valido."
+
+#: contrib/localflavor/ro/forms.py:141
+msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
+msgstr "Inserire un codice IBAN valido nel formato ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
+
+#: contrib/localflavor/ro/forms.py:171
+msgid "Phone numbers must be in XXXX-XXXXXX format."
+msgstr "I numeri di telefono devono essere in formato XXXX-XXXXXX."
+
+#: contrib/localflavor/ro/forms.py:194
+msgid "Enter a valid postal code in the format XXXXXX"
+msgstr "Inserire un codice postale valido nel formato XXXXXX."
+
#: contrib/localflavor/sk/forms.py:30
msgid "Enter a postal code in the format XXXXX or XXX XX."
msgstr "Inserire un codice postale nel formato XXXXX o XXX XX ."
@@ -3559,18 +3686,14 @@ msgstr "nome di dominio"
msgid "display name"
msgstr "nome visualizzato"
-#: contrib/sites/models.py:37
+#: contrib/sites/models.py:38
msgid "site"
msgstr "sito"
-#: contrib/sites/models.py:38
+#: contrib/sites/models.py:39
msgid "sites"
msgstr "siti"
-#: core/validators.py:72
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Questo valore può contenere solo lettere, cifre e sottolineati."
-
#: core/validators.py:76
msgid ""
"This value must contain only letters, numbers, underscores, dashes or "
@@ -3615,7 +3738,7 @@ msgstr "Sono ammessi soltanto caratteri numerici."
msgid "This value can't be comprised solely of digits."
msgstr "Questo valore non può essere composto solo da cifre."
-#: core/validators.py:128 newforms/fields.py:157
+#: core/validators.py:128 forms/fields.py:161
msgid "Enter a whole number."
msgstr "Inserire un numero intero."
@@ -3624,62 +3747,58 @@ msgid "Only alphabetical characters are allowed here."
msgstr "Sono ammessi solo caratteri alfabetici."
#: core/validators.py:147
-msgid "Year must be 1900 or later."
-msgstr "L'anno deve essere 1900 o successivo."
-
-#: core/validators.py:151
#, python-format
msgid "Invalid date: %s"
msgstr "Data non valida: %s"
-#: core/validators.py:156 db/models/fields/__init__.py:554
+#: core/validators.py:152 db/models/fields/__init__.py:569
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Inserire una data valida in formato AAAA-MM-GG."
-#: core/validators.py:161
+#: core/validators.py:157
msgid "Enter a valid time in HH:MM format."
msgstr "Inserire un ora valida in formato OO:MM."
-#: core/validators.py:165 db/models/fields/__init__.py:631
+#: core/validators.py:161
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Inserire una data/ora valida in formato AAAA-MM-GG OO:MM."
-#: core/validators.py:170 newforms/fields.py:408
+#: core/validators.py:166 forms/fields.py:412
msgid "Enter a valid e-mail address."
msgstr "Inserire un indirizzo e-mail valido."
-#: core/validators.py:182 core/validators.py:474 newforms/fields.py:426
+#: core/validators.py:178 core/validators.py:470 forms/fields.py:430
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Non è stato inviato alcun file. Verificare il tipo di codifica della form."
-#: core/validators.py:193 newforms/fields.py:468
+#: core/validators.py:189 forms/fields.py:470
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Caricare un'immagine valida. Il file caricato non è un'immagine o è corrotto."
-#: core/validators.py:200
+#: core/validators.py:196
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "La URL %s non punta ad un'immagine valida."
-#: core/validators.py:204
+#: core/validators.py:200
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
msgstr ""
"I numeri di telefono devono essere in formato XXX-XXX-XXXX . \"%s\" non è "
"valido."
-#: core/validators.py:212
+#: core/validators.py:208
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "La URL %s non punta ad un video QuickTime valido."
-#: core/validators.py:216
+#: core/validators.py:212
msgid "A valid URL is required."
msgstr "Inserire una URL valida."
-#: core/validators.py:230
+#: core/validators.py:226
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
@@ -3688,91 +3807,91 @@ msgstr ""
"È richiesto HTML valido. Gli errori sono i seguenti:\n"
"%s"
-#: core/validators.py:237
+#: core/validators.py:233
#, python-format
msgid "Badly formed XML: %s"
msgstr "XML malformato: %s"
-#: core/validators.py:254
+#: core/validators.py:250
#, python-format
msgid "Invalid URL: %s"
msgstr "URL non valida: %s"
-#: core/validators.py:259 core/validators.py:261
+#: core/validators.py:255 core/validators.py:257
#, python-format
msgid "The URL %s is a broken link."
msgstr "La URL %s è un link non funzionante."
-#: core/validators.py:267
+#: core/validators.py:263
msgid "Enter a valid U.S. state abbreviation."
msgstr "Inserire un valido nome di stato USA abbreviato."
-#: core/validators.py:281
+#: core/validators.py:277
#, 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] "Moderare i termini: la parola %s non è ammessa."
msgstr[1] "Moderare i termini: le parole %s non sono ammesse."
-#: core/validators.py:288
+#: core/validators.py:284
#, python-format
msgid "This field must match the '%s' field."
msgstr "Questo campo deve corrispondere al campo '%s'."
-#: core/validators.py:307
+#: core/validators.py:303
msgid "Please enter something for at least one field."
msgstr "Inserire qualcosa in almeno un campo."
-#: core/validators.py:316 core/validators.py:327
+#: core/validators.py:312 core/validators.py:323
msgid "Please enter both fields or leave them both empty."
msgstr "Inserire entrambi i campi o lasciarli entrambi vuoti."
-#: core/validators.py:335
+#: core/validators.py:331
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "Questo campo è obbligatorio se %(field)s è %(value)s"
-#: core/validators.py:348
+#: core/validators.py:344
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr "Questo campo è obbligatorio se %(field)s non è %(value)s"
-#: core/validators.py:367
+#: core/validators.py:363
msgid "Duplicate values are not allowed."
msgstr "Non sono ammessi valori duplicati."
-#: core/validators.py:382
+#: core/validators.py:378
#, python-format
msgid "This value must be between %(lower)s and %(upper)s."
msgstr "Questo valore deve essere compreso tra %(lower)s e %(upper)s."
-#: core/validators.py:384
+#: core/validators.py:380
#, python-format
msgid "This value must be at least %s."
msgstr "Questo valore deve essere almeno pari a %s."
-#: core/validators.py:386
+#: core/validators.py:382
#, python-format
msgid "This value must be no more than %s."
msgstr "Questo valore non deve essere maggiore di %s."
-#: core/validators.py:427
+#: core/validators.py:423
#, python-format
msgid "This value must be a power of %s."
msgstr "Questo valore deve essere una potenza di %s."
-#: core/validators.py:437
+#: core/validators.py:433
msgid "Please enter a valid decimal number."
msgstr "Inserire un numero decimale valido."
-#: core/validators.py:444
+#: core/validators.py:440
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
msgid_plural "Please enter a valid decimal number with at most %s total digits."
msgstr[0] "Inserire un numero decimale con non più di %s cifra in totale."
msgstr[1] "Inserire un numero decimale con non più di %s cifre in totale."
-#: core/validators.py:447
+#: core/validators.py:443
#, python-format
msgid "Please enter a valid decimal number with a whole part of at most %s digit."
msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
@@ -3783,48 +3902,48 @@ msgstr[1] ""
"Inserire un numero decimale la cui parte intera sia composta da non più di %"
"s cifre."
-#: core/validators.py:450
+#: core/validators.py:446
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural "Please enter a valid decimal number with at most %s decimal places."
msgstr[0] "Inserire un decimale con non più di %s cifra decimale."
msgstr[1] "Inserire un decimale con non più di %s cifre decimali."
-#: core/validators.py:458
+#: core/validators.py:454
msgid "Please enter a valid floating point number."
msgstr "Inserire un numero decimale valido."
-#: core/validators.py:467
+#: core/validators.py:463
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "Verificare che il file caricato sia grande almeno %s byte."
-#: core/validators.py:468
+#: core/validators.py:464
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "Verificare che il file caricato non sia più grande di %s byte."
-#: core/validators.py:485
+#: core/validators.py:481
msgid "The format for this field is wrong."
msgstr "Il formato di questo campo non è valido."
-#: core/validators.py:500
+#: core/validators.py:496
msgid "This field is invalid."
msgstr "Questo campo non è valido."
-#: core/validators.py:536
+#: core/validators.py:532
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "Impossibile recuperare alcunché da %s."
-#: core/validators.py:539
+#: core/validators.py:535
#, python-format
msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
msgstr ""
"La URL %(url)s ha restituito un header Content-Type non valido: '%"
"(contenttype)s'."
-#: core/validators.py:572
+#: core/validators.py:568
#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -3833,7 +3952,7 @@ msgstr ""
"Chiudere il tag %(tag)s a linea %(line)s. (La linea inizia con \"%(start)s"
"\".)"
-#: core/validators.py:576
+#: core/validators.py:572
#, python-format
msgid ""
"Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -3842,7 +3961,7 @@ msgstr ""
"Il testo che comincia a linea %(line)s non e' ammesso in quel contesto. (La "
"linea comincia con \"%(start)s\".)"
-#: core/validators.py:581
+#: core/validators.py:577
#, python-format
msgid ""
"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -3851,7 +3970,7 @@ msgstr ""
"\"%(attr)s\" a linea %(line)s non è un attributo valido. (La linea comincia "
"con \"%(start)s\".)"
-#: core/validators.py:586
+#: core/validators.py:582
#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -3860,7 +3979,7 @@ msgstr ""
"\"<%(tag)s>\" a linea %(line)s non è un tag valido. (La linea comincia con "
"\"%(start)s\".)"
-#: core/validators.py:590
+#: core/validators.py:586
#, python-format
msgid ""
"A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -3869,7 +3988,7 @@ msgstr ""
"Un tag a linea %(line)s manca di uno o più attributi richiesti. (La linea "
"comincia con \"%(start)s\".)"
-#: core/validators.py:595
+#: core/validators.py:591
#, python-format
msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -3878,192 +3997,196 @@ msgstr ""
"L'attributo \"%(attr)s\" a linea %(line)s ha un valore non valido. (La linea "
"comincia con \"%(start)s\".)"
-#: db/models/manipulators.py:308
+#: db/models/manipulators.py:304
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "Un %(object)s·con questo·%(type)s·esiste già per questo·%(field)s."
-#: db/models/fields/__init__.py:52
+#: db/models/fields/__init__.py:46
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "Un %(optname)s·con questo·%(fieldname)s·esiste già."
-#: db/models/fields/__init__.py:182 db/models/fields/__init__.py:354
-#: db/models/fields/__init__.py:788 db/models/fields/__init__.py:799
-#: newforms/fields.py:51 oldforms/__init__.py:374
+#: db/models/fields/__init__.py:170 db/models/fields/__init__.py:343
+#: db/models/fields/__init__.py:792 db/models/fields/__init__.py:803
+#: forms/fields.py:52 oldforms/__init__.py:370
msgid "This field is required."
msgstr "Questo campo è obbligatorio."
-#: db/models/fields/__init__.py:454
+#: db/models/fields/__init__.py:457
msgid "This value must be an integer."
msgstr "Questo valore deve essere un intero."
-#: db/models/fields/__init__.py:493
+#: db/models/fields/__init__.py:503
msgid "This value must be either True or False."
msgstr "Questo valore deve essere True o False."
-#: db/models/fields/__init__.py:517
+#: db/models/fields/__init__.py:532
msgid "This field cannot be null."
msgstr "Questo campo non può essere nullo."
-#: db/models/fields/__init__.py:695
+#: db/models/fields/__init__.py:634 db/models/fields/__init__.py:651
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[ss[.uuuuuu]] format."
+msgstr "Inserire una data/ora valida nel formato AAAA-MM-GG OO:MM[ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:707
msgid "This value must be a decimal number."
msgstr "Questo valore deve essere un numero decimale."
-#: db/models/fields/__init__.py:808
+#: db/models/fields/__init__.py:812
msgid "Enter a valid filename."
msgstr "Inserire un nome di file valido."
-#: db/models/fields/__init__.py:999
+#: db/models/fields/__init__.py:1013
msgid "This value must be either None, True or False."
msgstr "Questo valore deve essere None, True o False."
-#: db/models/fields/related.py:94
+#: db/models/fields/__init__.py:1128 db/models/fields/__init__.py:1141
+msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
+msgstr "Inserire un ora valida nel formato OO:MM[ss[.uuuuuu]]."
+
+#: db/models/fields/related.py:93
#, python-format
msgid "Please enter a valid %s."
msgstr "Inserire un %s valido."
-#: db/models/fields/related.py:756
-msgid "Separate multiple IDs with commas."
-msgstr "Separare gli ID multipli con virgole."
-
-#: db/models/fields/related.py:758
+#: db/models/fields/related.py:753
msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Tenere premuto \"Control\", o \"Command\" su Mac, per selezionarne più di "
"uno."
-#: db/models/fields/related.py:805
+#: db/models/fields/related.py:833
#, 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] "Inserire un ID valido per %(self)s. Il valore %(value)r non è valido."
msgstr[1] "Inserire ID validi per %(self)s. I valori %(value)r non sono validi."
-#: newforms/fields.py:52
+#: forms/fields.py:53
msgid "Enter a valid value."
msgstr "Inserire un valore valido."
-#: newforms/fields.py:129
+#: forms/fields.py:133
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Assicurarsi che questo valore non contenga più di %(max)d caratteri (ne ha %"
"(length)d)."
-#: newforms/fields.py:130
+#: forms/fields.py:134
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Assicurarsi che questo valore contenga almeno %(min)d caratteri (ne ha %"
"(length)d)."
-#: newforms/fields.py:158 newforms/fields.py:187 newforms/fields.py:216
+#: forms/fields.py:162 forms/fields.py:191 forms/fields.py:220
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Assicurarsi che questo valore sia minore o uguale a %s."
-#: newforms/fields.py:159 newforms/fields.py:188 newforms/fields.py:217
+#: forms/fields.py:163 forms/fields.py:192 forms/fields.py:221
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Assicurarsi che questo valore sia maggiore o uguale a %s."
-#: newforms/fields.py:186 newforms/fields.py:215
+#: forms/fields.py:190 forms/fields.py:219
msgid "Enter a number."
msgstr "Inserire un numero."
-#: newforms/fields.py:218
+#: forms/fields.py:222
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Assicurarsi che non vi siano più di %s cifre in totale."
-#: newforms/fields.py:219
+#: forms/fields.py:223
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Assicurarsi che non vi siano più di %s cifre decimali."
-#: newforms/fields.py:220
+#: forms/fields.py:224
#, python-format
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."
-#: newforms/fields.py:268 newforms/fields.py:779
+#: forms/fields.py:272 forms/fields.py:802
msgid "Enter a valid date."
msgstr "Inserire una data valida."
-#: newforms/fields.py:301 newforms/fields.py:780
+#: forms/fields.py:305 forms/fields.py:803
msgid "Enter a valid time."
msgstr "Inserire un ora valida."
-#: newforms/fields.py:340
+#: forms/fields.py:344
msgid "Enter a valid date/time."
msgstr "Inserire una coppia data/ora valida."
-#: newforms/fields.py:427
+#: forms/fields.py:431
msgid "No file was submitted."
msgstr "Nessun file è stato inviato."
-#: newforms/fields.py:428 oldforms/__init__.py:693
+#: forms/fields.py:432 oldforms/__init__.py:689
msgid "The submitted file is empty."
msgstr "Il file inviato è vuoto."
-#: newforms/fields.py:522
+#: forms/fields.py:531
msgid "Enter a valid URL."
msgstr "Inserire una URL valida."
-#: newforms/fields.py:523
+#: forms/fields.py:532
msgid "This URL appears to be a broken link."
msgstr "Questa URL non sembra funzionare."
-#: newforms/fields.py:588 newforms/models.py:306
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-"Scegliere un'opzione valida. La scelta effettuata non compare tra quelle "
-"disponibili."
-
-#: newforms/fields.py:627
+#: forms/fields.py:600 forms/fields.py:651
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Scegliere un'opzione valida. '%(value)s non compare tra quelle disponibili."
-#: newforms/fields.py:628 newforms/fields.py:690 newforms/models.py:373
+#: forms/fields.py:652 forms/fields.py:713 forms/models.py:589
msgid "Enter a list of values."
msgstr "Inserire una lista di valori."
-#: newforms/fields.py:808
+#: forms/fields.py:831
msgid "Enter a valid IPv4 address."
msgstr "Inserire un indirizzo IPv4 valido."
-#: newforms/models.py:374
+#: forms/models.py:522
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Scegliere un'opzione valida. La scelta effettuata non compare tra quelle "
+"disponibili."
+
+#: forms/models.py:590
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Scegliere un'opzione valida. '%s non compare tra quelle disponibili."
-#: oldforms/__init__.py:409
+#: oldforms/__init__.py:405
#, python-format
msgid "Ensure your text is less than %s character."
msgid_plural "Ensure your text is less than %s characters."
msgstr[0] "Assicurarsi che il testo sia più corto di %s carattere."
msgstr[1] "Assicurarsi che il testo sia più corto di %s caratteri."
-#: oldforms/__init__.py:414
+#: oldforms/__init__.py:410
msgid "Line breaks are not allowed here."
msgstr "Non sono ammessi a capo manuali qui."
-#: oldforms/__init__.py:512 oldforms/__init__.py:586 oldforms/__init__.py:625
+#: oldforms/__init__.py:508 oldforms/__init__.py:582 oldforms/__init__.py:621
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Scegliere un'opzione valida; '%(data)s' non presente in %(choices)s."
-#: oldforms/__init__.py:754
+#: oldforms/__init__.py:750
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Inserire un numero intero compreso tra -32.768 e 32.767 ."
-#: oldforms/__init__.py:764
+#: oldforms/__init__.py:760
msgid "Enter a positive number."
msgstr "Inserire un numero positivo."
-#: oldforms/__init__.py:774
+#: oldforms/__init__.py:770
msgid "Enter a whole number between 0 and 32,767."
msgstr "Inserire un numero intero compreso tra 0 e 32.767 ."
@@ -4351,37 +4474,37 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:412
+#: utils/translation/trans_real.py:401
msgid "DATE_FORMAT"
msgstr "j F Y"
-#: utils/translation/trans_real.py:413
+#: utils/translation/trans_real.py:402
msgid "DATETIME_FORMAT"
msgstr "j F Y, H:i"
-#: utils/translation/trans_real.py:414
+#: utils/translation/trans_real.py:403
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:430
+#: utils/translation/trans_real.py:419
msgid "YEAR_MONTH_FORMAT"
msgstr "Y F"
-#: utils/translation/trans_real.py:431
+#: utils/translation/trans_real.py:420
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
-#: views/generic/create_update.py:43
+#: views/generic/create_update.py:129
#, python-format
msgid "The %(verbose_name)s was created successfully."
msgstr "%(verbose_name)s è stato creato correttamente."
-#: views/generic/create_update.py:117
+#: views/generic/create_update.py:172
#, python-format
msgid "The %(verbose_name)s was updated successfully."
msgstr "%(verbose_name)s è stato aggiornato correttamente."
-#: views/generic/create_update.py:184
+#: views/generic/create_update.py:214
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s è stato cancellato."
diff --git a/django/conf/locale/ka/LC_MESSAGES/django.mo b/django/conf/locale/ka/LC_MESSAGES/django.mo
index 0b611080d0..91957f682b 100644
Binary files a/django/conf/locale/ka/LC_MESSAGES/django.mo and b/django/conf/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ka/LC_MESSAGES/django.po b/django/conf/locale/ka/LC_MESSAGES/django.po
index c189e67a81..0649b56458 100644
--- a/django/conf/locale/ka/LC_MESSAGES/django.po
+++ b/django/conf/locale/ka/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-22 21:55+0400\n"
+"POT-Creation-Date: 2008-07-15 21:17+0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: David Avsajanishvili \n"
"Language-Team: LANGUAGE \n"
@@ -14,191 +14,199 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:44
msgid "Arabic"
msgstr "არაბული"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:45
msgid "Bengali"
msgstr "ბენგალიური"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:46
msgid "Bulgarian"
msgstr "ბულგარული"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:47
msgid "Catalan"
msgstr "კატალანური"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:48
msgid "Czech"
msgstr "ჩეხური"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:49
msgid "Welsh"
msgstr "უელსური"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:50
msgid "Danish"
msgstr "დანიური"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:51
msgid "German"
msgstr "გერმანული"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:52
msgid "Greek"
msgstr "ბერძნული"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
msgid "English"
msgstr "ინგლისური"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:54
msgid "Spanish"
msgstr "ესპანური"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:55
+msgid "Estonian"
+msgstr "ესტონური"
+
+#: conf/global_settings.py:56
msgid "Argentinean Spanish"
msgstr "არგენტინის ესპანური"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:57
msgid "Basque"
msgstr "ბასკური"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:58
msgid "Persian"
msgstr "სპარსული"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:59
msgid "Finnish"
msgstr "ფინური"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:60
msgid "French"
msgstr "ფრანგული"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:61
msgid "Irish"
msgstr "ირლანდიური"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:62
msgid "Galician"
msgstr "გალიციური"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:63
msgid "Hungarian"
msgstr "უნგრული"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:64
msgid "Hebrew"
msgstr "ებრაული"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:65
msgid "Croatian"
msgstr "ხორვატიული"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:66
msgid "Icelandic"
msgstr "ისლანდიური"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:67
msgid "Italian"
msgstr "იტალიური"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:68
msgid "Japanese"
msgstr "იაპონური"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:69
msgid "Georgian"
msgstr "ქართული"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:70
msgid "Korean"
msgstr "კორეული"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:71
msgid "Khmer"
msgstr "ხმერული"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:72
msgid "Kannada"
msgstr "კანნადა"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:73
msgid "Latvian"
msgstr "ლატვიური"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:74
+msgid "Lithuanian"
+msgstr "ლიტვური"
+
+#: conf/global_settings.py:75
msgid "Macedonian"
msgstr "მაკედონური"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:76
msgid "Dutch"
msgstr "ჰოლანდიური"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:77
msgid "Norwegian"
msgstr "ნორვეგიული"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:78
msgid "Polish"
msgstr "პოლონური"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:79
msgid "Portugese"
msgstr "პორტუგალიური"
-#: conf/global_settings.py:73
-msgid "Brazilian"
-msgstr "ბრაზილიური"
+#: conf/global_settings.py:80
+msgid "Brazilian Portuguese"
+msgstr "ბრაზილიური პორტუგალიური"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:81
msgid "Romanian"
msgstr "რუმინული"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:82
msgid "Russian"
msgstr "რუსული"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:83
msgid "Slovak"
msgstr "სლოვარური"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:84
msgid "Slovenian"
msgstr "სლოვენიური"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:85
msgid "Serbian"
msgstr "სერბული"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:86
msgid "Swedish"
msgstr "შვედური"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:87
msgid "Tamil"
msgstr "თამილური"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:88
msgid "Telugu"
msgstr "ტელუგუ"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:89
msgid "Turkish"
msgstr "თურქული"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:90
msgid "Ukrainian"
msgstr "უკრაინული"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:91
msgid "Simplified Chinese"
msgstr "გამარტივებული ჩინური"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:92
msgid "Traditional Chinese"
msgstr "ტრადიციული ჩინური"
@@ -322,7 +330,7 @@ msgid ""
"There's been an error. It's been reported to the site administrators via e-"
"mail and should be fixed shortly. Thanks for your patience."
msgstr ""
-"აქ იყო შეცდომა. იგი გადაგზავნილია საიტის ადმინისტრატორის ელექტრონულ ფოსტაზე "
+"სისტემაში მოხდა შეცდომა. იგი გადაგზავნილია საიტის ადმინისტრატორის ელექტრონულ ფოსტაზე "
"და მალე გამოსწორდება. გმადლობთ მოთმინებისათვის."
#: contrib/admin/templates/admin/base.html:26
@@ -477,7 +485,7 @@ msgid "Password:"
msgstr "პაროლი:"
#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:25
+#: contrib/admin/views/decorators.py:31
msgid "Log in"
msgstr "შესვლა"
@@ -799,7 +807,7 @@ msgstr "პაროლი წარმატებით შეიცვალ
msgid "Change password: %s"
msgstr "შევცვალოთ პაროლი: %s"
-#: contrib/admin/views/decorators.py:11 contrib/auth/forms.py:60
+#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60
msgid ""
"Please enter a correct username and password. Note that both fields are case-"
"sensitive."
@@ -807,7 +815,7 @@ msgstr ""
"გთხოვთ, შეიყვანოთ სწორი მომხმარებლის სახელი და პაროლი. გაითვალისწინეთ, რომ "
"ორივე ველი დამოკიდებულია რეგისტრზე."
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:69
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
@@ -815,7 +823,7 @@ msgstr ""
"გთხოვთ, შეხვიდეთ კიდევ ერთხელ, რადგანაც თქვენი სესიის დრო ამოიწურა. ნუ "
"ღელავთ: თქვენს მიერ შეტანილი ცვლილებები შენახულია."
-#: contrib/admin/views/decorators.py:70
+#: contrib/admin/views/decorators.py:76
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -823,17 +831,17 @@ msgstr ""
"როგორც ჩანს, თქვენი ბროუზერი არ ღებულობს cookie-ებს. გთხოვთ, ჩართოთ cookie-"
"ების მიღების ფუნქცია, განაახლეთ ეს გვერდი და სცადეთ კიდევ ერთხელ."
-#: contrib/admin/views/decorators.py:84
-msgid "Usernames cannot contain the '@' character."
-msgstr "მომხმარებლის სახელი არ უნდა შეიცავდეს სიმბოლოს '@'."
-
-#: contrib/admin/views/decorators.py:86
+#: contrib/admin/views/decorators.py:89
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
"ელ-ფოსტის მისამართი არ არის თქვენი მომხმარებლის სახელი. სცადეთ '%s' მის "
"ნაცვლად."
+#: contrib/admin/views/decorators.py:93
+msgid "Usernames cannot contain the '@' character."
+msgstr "მომხმარებლის სახელი არ უნდა შეიცავდეს სიმბოლოს '@'."
+
#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
#: contrib/admin/views/doc.py:52
msgid "tag:"
@@ -957,7 +965,7 @@ msgstr "ტექსტი"
msgid "Time"
msgstr "დრო"
-#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7
+#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:8
msgid "URL"
msgstr ""
@@ -1065,7 +1073,7 @@ msgstr "ავირჩიოთ %s"
msgid "Select %s to change"
msgstr "აირჩიეთ %s შესაცვლელად"
-#: contrib/admin/views/main.py:784
+#: contrib/admin/views/main.py:765
msgid "Database error"
msgstr "მონაცემთა ბაზის შეცდომა"
@@ -1129,15 +1137,15 @@ msgstr "უფლებები"
msgid "group"
msgstr "ჯგუფი"
-#: contrib/auth/models.py:98 contrib/auth/models.py:141
+#: contrib/auth/models.py:98 contrib/auth/models.py:148
msgid "groups"
msgstr "ჯგუფები"
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:138
msgid "username"
msgstr "მომხმარებლის სახელი"
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:138
msgid ""
"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
"digits and underscores)."
@@ -1145,23 +1153,23 @@ msgstr ""
"აუცილებელია. 30 ან ნაკლები სიმბოლო. მხოლოდ ლათინური ასოები, ციფრები და "
"ხაზგასმა."
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:139
msgid "first name"
msgstr "სახელი"
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:140
msgid "last name"
msgstr "გვარი"
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:141
msgid "e-mail address"
msgstr "ელ. ფოსტა"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:142
msgid "password"
msgstr "პაროლი"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:142
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the change "
"password form."
@@ -1169,46 +1177,46 @@ msgstr ""
"გამოიყენეთ '[algo]$[salt]$[hexdigest]' ან პაროლის "
"შეცვლის ფორმა."
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:143
msgid "staff status"
msgstr "თანამშრომლობის სტატუსი"
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:143
msgid "Designates whether the user can log into this admin site."
msgstr ""
"განსაზღვრავს, აქვს თუ არა მომხმარებელს ადმინისტრირების საიტზე შესვლის უფლება."
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:144
msgid "active"
msgstr "აქტიურია"
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:144
msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
+"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
msgstr ""
-"განსაზღვრავს, აქვს თუ არა მომხმარებელს Django-ს ადმინისტრირების საიტზე "
-"შესვლის შესაძლებლობა. გადანიშნეთ ეს დროშა მომხმარებლის წაშლის მაგივრად."
+"განსაზღვრავს, რომ მომხმარებელი გააქტიურებულია. "
+"მომხმარებლის წაშლის მაგივრად გადანიშნეთ ეს დროშა."
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:145
msgid "superuser status"
msgstr "სუპერმომხმარებლის სტატუსი"
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:145
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
msgstr "განსაზღვრავს, რომ ამ მომხმარებელს აქვს ყველა უფლება."
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:146
msgid "last login"
msgstr "ბოლო შესვლა"
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:147
msgid "date joined"
msgstr "გაწევრიანების თარიღი"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:149
msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
@@ -1216,39 +1224,39 @@ msgstr ""
"ინდივიდუალურად მითითებული უფლებების გარდა, ეს მომხმარებელი მიიღებს აგრეთვე "
"ყველა იმ ჯგუფის უფლებას, რომელშიც იგი გაწევრიანებულია."
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:150
msgid "user permissions"
msgstr "მომხმარებლის უფლებები"
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:154
msgid "user"
msgstr "მომხმარებელი"
-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:155
msgid "users"
msgstr "მომხმარებლები"
-#: contrib/auth/models.py:154
+#: contrib/auth/models.py:160
msgid "Personal info"
msgstr "პირადი ინფორმაცია"
-#: contrib/auth/models.py:155
+#: contrib/auth/models.py:161
msgid "Permissions"
msgstr "უფლებები"
-#: contrib/auth/models.py:156
+#: contrib/auth/models.py:162
msgid "Important dates"
msgstr "მნიშვნელოვანი თარიღები"
-#: contrib/auth/models.py:157
+#: contrib/auth/models.py:163
msgid "Groups"
msgstr "ჯგუფები"
-#: contrib/auth/models.py:316
+#: contrib/auth/models.py:323
msgid "message"
msgstr "შეტყობინება"
-#: contrib/auth/views.py:47
+#: contrib/auth/views.py:49
msgid "Logged out"
msgstr "გამოსული ხართ"
@@ -1546,42 +1554,42 @@ msgstr "კომენტარის ID არასწორია"
msgid "No voting for yourself"
msgstr "საკუთარი თავისათვის ხმის მიცემა აკრძალულია"
-#: contrib/contenttypes/models.py:37
+#: contrib/contenttypes/models.py:67
msgid "python model class name"
msgstr "python-ის მოდელის კლასის სახელი"
-#: contrib/contenttypes/models.py:40
+#: contrib/contenttypes/models.py:71
msgid "content type"
msgstr "კონტენტის ტიპი"
-#: contrib/contenttypes/models.py:41
+#: contrib/contenttypes/models.py:72
msgid "content types"
msgstr "კონტენტის ტიპები"
-#: contrib/flatpages/models.py:8
+#: contrib/flatpages/models.py:9
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"მაგალითი: '/about/contact/'. ყურადღება მიაქციეთ დახრილ ხაზებს თავში და "
"ბოლოში."
-#: contrib/flatpages/models.py:9
+#: contrib/flatpages/models.py:10
msgid "title"
msgstr "სათაური"
-#: contrib/flatpages/models.py:10
+#: contrib/flatpages/models.py:11
msgid "content"
msgstr "კონტენტი"
-#: contrib/flatpages/models.py:11
+#: contrib/flatpages/models.py:12
msgid "enable comments"
msgstr "ჩავრთოთ კომენტარები"
-#: contrib/flatpages/models.py:12
+#: contrib/flatpages/models.py:13
msgid "template name"
msgstr "შაბლონის სახელი"
-#: contrib/flatpages/models.py:13
+#: contrib/flatpages/models.py:14
msgid ""
"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
"will use 'flatpages/default.html'."
@@ -1589,24 +1597,28 @@ msgstr ""
"მაგალითი: 'flatpages/contact_page.html'. თუ იგი მითითებული არ არის, "
"გამოყენებული იქნება 'flatpages/default.html'."
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
msgid "registration required"
msgstr "რეგისტრაცია აუცილებელია"
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"თუ ეს დროშა ჩართულია, მხოლო შემოსულ მომხმარებლებს ექნებათ გვერდის "
"დათვალიერების საშუალება."
-#: contrib/flatpages/models.py:18
+#: contrib/flatpages/models.py:20
msgid "flat page"
msgstr "უბრალო გვერდი"
-#: contrib/flatpages/models.py:19
+#: contrib/flatpages/models.py:21
msgid "flat pages"
msgstr "უბრალო გვერდები"
+#: contrib/flatpages/models.py:27
+msgid "Advanced options"
+msgstr "დამატებითი პარამეტრები"
+
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr ""
@@ -3632,23 +3644,23 @@ msgstr "გადამისამართება"
msgid "redirects"
msgstr "გადამისამართებები"
-#: contrib/sessions/models.py:41
+#: contrib/sessions/models.py:45
msgid "session key"
msgstr "სესიის გასაღები"
-#: contrib/sessions/models.py:42
+#: contrib/sessions/models.py:47
msgid "session data"
msgstr "სესიის მონაცემები"
-#: contrib/sessions/models.py:43
+#: contrib/sessions/models.py:48
msgid "expire date"
msgstr "ამოწურვის თარიღი"
-#: contrib/sessions/models.py:48
+#: contrib/sessions/models.py:53
msgid "session"
msgstr "სესია"
-#: contrib/sessions/models.py:49
+#: contrib/sessions/models.py:54
msgid "sessions"
msgstr "სესიები"
@@ -3720,7 +3732,7 @@ msgstr "არაციფრული სიმბოლოები აქ დ
msgid "This value can't be comprised solely of digits."
msgstr "ეს მნიშვნელობა არ უნდა შედგებოდეს მხოლოდ ციფრებისაგან."
-#: core/validators.py:128 newforms/fields.py:151
+#: core/validators.py:128 newforms/fields.py:157
msgid "Enter a whole number."
msgstr "შეიყვანეთ მთელი რიცხვი"
@@ -3737,7 +3749,7 @@ msgstr "წელი უნდა იყოს 1900 ან მეტი."
msgid "Invalid date: %s"
msgstr "არასწორი თარიღი: %s"
-#: core/validators.py:156 db/models/fields/__init__.py:518
+#: core/validators.py:156 db/models/fields/__init__.py:565
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "შეიყვანეთ სწორი თარიღი YYYY-MM-DD ფორმატში."
@@ -3745,21 +3757,20 @@ msgstr "შეიყვანეთ სწორი თარიღი YYYY-MM-D
msgid "Enter a valid time in HH:MM format."
msgstr "შეიყვანეთ სწორი დრო HH:MM ფორმატში."
-#: core/validators.py:165 db/models/fields/__init__.py:595
+#: core/validators.py:165 db/models/fields/__init__.py:642
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "შეიყვანეთ სწორი თარიღი და დრო YYYY-MM-DD HH:MM ფორმატში."
-#: core/validators.py:170 newforms/fields.py:402
+#: core/validators.py:170 newforms/fields.py:408
msgid "Enter a valid e-mail address."
msgstr "შეიყვანეთ სწორი ელ. ფოსტის მისამართი."
-#: core/validators.py:182 core/validators.py:474 newforms/fields.py:432
-#: oldforms/__init__.py:687
+#: core/validators.py:182 core/validators.py:474 newforms/fields.py:426
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"ფაილი არ იყო გამოგზავნილი. შეამოწმეთ კოდირების ტიპი მოცემული ფორმისათვის."
-#: core/validators.py:193 newforms/fields.py:458
+#: core/validators.py:193 newforms/fields.py:468
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -3878,9 +3889,9 @@ msgid "Please enter a valid decimal number with at most %s total digit."
msgid_plural ""
"Please enter a valid decimal number with at most %s total digits."
msgstr[0] ""
-"გთხოვთ, შეიყვანოთ სწორი, არაუმეტეს %s თანრიგისაგან შემდგარი ათობითი რიცხვი"
+"გთხოვთ, შეიყვანოთ სწორი, არაუმეტეს %s თანრიგისაგან შემდგარი ათობითი რიცხვი."
msgstr[1] ""
-"გთხოვთ, შეიყვანოთ სწორი, არაუმეტეს %s თანრიგისაგან შემდგარი ათობითი რიცხვი"
+"გთხოვთ, შეიყვანოთ სწორი, არაუმეტეს %s თანრიგისაგან შემდგარი ათობითი რიცხვი."
#: core/validators.py:447
#, python-format
@@ -4009,53 +4020,53 @@ msgstr "%(object)s მოცემული %(type)s-ით უკვე არ
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "%(optname)s მოცემული %(fieldname)s-ით უკვე არსებობს."
-#: db/models/fields/__init__.py:161 db/models/fields/__init__.py:318
-#: db/models/fields/__init__.py:750 db/models/fields/__init__.py:761
-#: newforms/fields.py:45 oldforms/__init__.py:374
+#: db/models/fields/__init__.py:184 db/models/fields/__init__.py:356
+#: db/models/fields/__init__.py:799 db/models/fields/__init__.py:810
+#: newforms/fields.py:51 oldforms/__init__.py:374
msgid "This field is required."
msgstr "ეს ველი აუცილებელია."
-#: db/models/fields/__init__.py:418
+#: db/models/fields/__init__.py:465
msgid "This value must be an integer."
msgstr "ეს მნიშვნელობა უნდა იყოს მთელი."
-#: db/models/fields/__init__.py:457
+#: db/models/fields/__init__.py:504
msgid "This value must be either True or False."
msgstr "ეს მნიშვნელობა უნდა იყოს True ან False."
-#: db/models/fields/__init__.py:481
+#: db/models/fields/__init__.py:528
msgid "This field cannot be null."
msgstr "ეს მნიშვნელობა არ შეიძლება იყოს null."
-#: db/models/fields/__init__.py:659
+#: db/models/fields/__init__.py:706
msgid "This value must be a decimal number."
msgstr "ეს მნიშვნელობა უნდა იყოს ათობითი რიცხვი."
-#: db/models/fields/__init__.py:770
+#: db/models/fields/__init__.py:819
msgid "Enter a valid filename."
msgstr "შეიყვანეთ სწორი ფაილის სახელი."
-#: db/models/fields/__init__.py:941
+#: db/models/fields/__init__.py:1013
msgid "This value must be either None, True or False."
msgstr "ეს მნიშვნელობა უნდა იყოს None, True ან False."
-#: db/models/fields/related.py:55
+#: db/models/fields/related.py:94
#, python-format
msgid "Please enter a valid %s."
msgstr "გთხოვთ, შეიყვანოთ სწორი %s."
-#: db/models/fields/related.py:658
+#: db/models/fields/related.py:756
msgid "Separate multiple IDs with commas."
msgstr "გამოყავით ID-ები მძიმეებით."
-#: db/models/fields/related.py:660
+#: db/models/fields/related.py:758
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"დააჭირეთ \"Control\", ან \"Command\" Mac-ზე, ერთზე მეტი მნიშვნელობის "
"ასარჩევად."
-#: db/models/fields/related.py:707
+#: db/models/fields/related.py:805
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -4065,99 +4076,99 @@ msgstr[0] ""
msgstr[1] ""
"გთხოვთ, შეიყვანოთ სწორი %(self)s ID-ები. მნიშვნელობები %(value)r არასწორია."
-#: newforms/fields.py:46
+#: newforms/fields.py:52
msgid "Enter a valid value."
msgstr "შეიყვანეთ სწორი მნიშვნელობა."
-#: newforms/fields.py:123
+#: newforms/fields.py:129
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"დარწმუნდით, რომ მნიშვნელობა შედგება არაუმეტეს %(max)d სიმბოლოსაგან (ახლა "
"მისი სიგრძეა %(length)d)."
-#: newforms/fields.py:124
+#: newforms/fields.py:130
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"დარწმუნდით, რომ მნიშვნელობა შედგება არანაკლებ %(min)d სიმბოლოსაგან (ახლა "
"მისი სიგრძეა %(length)d)."
-#: newforms/fields.py:152 newforms/fields.py:181 newforms/fields.py:210
+#: newforms/fields.py:158 newforms/fields.py:187 newforms/fields.py:216
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "დარწმუნდით, რომ მნიშვნელობა ნაკლებია ან ტოლია %s-ზე."
-#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211
+#: newforms/fields.py:159 newforms/fields.py:188 newforms/fields.py:217
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "დარწმუნდით, რომ მნიშვნელობა მეტია ან ტოლია %s-ზე."
-#: newforms/fields.py:180 newforms/fields.py:209
+#: newforms/fields.py:186 newforms/fields.py:215
msgid "Enter a number."
msgstr "შეიყვანეთ რიცხვი."
-#: newforms/fields.py:212
+#: newforms/fields.py:218
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "დარწმუნდით, რომ მნიშვნელობა %s თანრიგს არ აღემატება."
-#: newforms/fields.py:213
+#: newforms/fields.py:219
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "დარწმუნდით, რომ წილადი ნაწილი %s თანრიგს არ აღემატება."
-#: newforms/fields.py:214
+#: newforms/fields.py:220
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "დარწმუნდით, რომ მთელი ნაწილი %s თანრიგს არ აღემატება."
-#: newforms/fields.py:262 newforms/fields.py:723
+#: newforms/fields.py:268 newforms/fields.py:781
msgid "Enter a valid date."
msgstr "შეიყვანეთ სწორი თარიღი."
-#: newforms/fields.py:295 newforms/fields.py:724
+#: newforms/fields.py:301 newforms/fields.py:782
msgid "Enter a valid time."
msgstr "შეიყვანეთ სწორი დრო."
-#: newforms/fields.py:334
+#: newforms/fields.py:340
msgid "Enter a valid date/time."
msgstr "შეიყვანეთ სწორი თარიღი და დრო."
-#: newforms/fields.py:433
+#: newforms/fields.py:427
msgid "No file was submitted."
msgstr "ფაილი არ იყო გამოგზავნილი."
-#: newforms/fields.py:434 oldforms/__init__.py:689
+#: newforms/fields.py:428 oldforms/__init__.py:693
msgid "The submitted file is empty."
msgstr "გამოგზავნილი ფაილი ცარიელია."
-#: newforms/fields.py:496
+#: newforms/fields.py:524
msgid "Enter a valid URL."
msgstr "შეიყვანეთ სწორი URL."
-#: newforms/fields.py:497
+#: newforms/fields.py:525
msgid "This URL appears to be a broken link."
msgstr "როგორც ჩანს, URL არის გაწყვეტილი ბმული."
-#: newforms/fields.py:559 newforms/models.py:300
+#: newforms/fields.py:590 newforms/models.py:306
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "აირჩიეთ დასაშვები მნიშვნელობა. ეს არჩევანი დასაშვები არ არის."
-#: newforms/fields.py:598
+#: newforms/fields.py:629
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "აირჩიეთ დასაშვები მნიშვნელობა. %(value)s დასაშვები არ არის."
-#: newforms/fields.py:599 newforms/fields.py:661 newforms/models.py:360
+#: newforms/fields.py:630 newforms/fields.py:692 newforms/models.py:373
msgid "Enter a list of values."
msgstr "შეიყვანეთ მნიშვნელობების სია."
-#: newforms/fields.py:752
+#: newforms/fields.py:810
msgid "Enter a valid IPv4 address."
msgstr "შეიყვანეთ სწორი IPv4 მისამართი."
-#: newforms/models.py:361
+#: newforms/models.py:374
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "აირჩიეთ დასაშვები მნიშვნელობა. %s დასაშვები არ არის."
@@ -4180,40 +4191,40 @@ msgstr ""
"აირჩიეთ დასაშვები მნიშვნელობა; '%(data)s' არ არის %(choices)s მნიშვნელობების "
"სიაში."
-#: oldforms/__init__.py:745
+#: oldforms/__init__.py:754
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "შეიყვანეთ მთელი რიცხვი -32,768-დან 32,767-მდე."
-#: oldforms/__init__.py:755
+#: oldforms/__init__.py:764
msgid "Enter a positive number."
msgstr "შეიყვანეთ დადებითი რიცხვი."
-#: oldforms/__init__.py:765
+#: oldforms/__init__.py:774
msgid "Enter a whole number between 0 and 32,767."
msgstr "შეიყვანეთ მთელი რიცხვი 0-დან 32,767-მდე."
-#: template/defaultfilters.py:691
+#: template/defaultfilters.py:698
msgid "yes,no,maybe"
msgstr "კი,არა,შესაძლოა"
-#: template/defaultfilters.py:722
+#: template/defaultfilters.py:729
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d ბაიტი"
msgstr[1] "%(size)d ბაიტი"
-#: template/defaultfilters.py:724
+#: template/defaultfilters.py:731
#, python-format
msgid "%.1f KB"
msgstr "%.1f კბაიტი"
-#: template/defaultfilters.py:726
+#: template/defaultfilters.py:733
#, python-format
msgid "%.1f MB"
msgstr "%.1f მბაიტი"
-#: template/defaultfilters.py:727
+#: template/defaultfilters.py:734
#, python-format
msgid "%.1f GB"
msgstr "%.1f გბაიტი"
@@ -4422,7 +4433,7 @@ msgstr "ნოემ."
msgid "Dec."
msgstr "დეკ."
-#: utils/text.py:127
+#: utils/text.py:128
msgid "or"
msgstr "ან"
@@ -4476,23 +4487,23 @@ msgstr ""
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:404
+#: utils/translation/trans_real.py:412
msgid "DATE_FORMAT"
msgstr "d.m.Y"
-#: utils/translation/trans_real.py:405
+#: utils/translation/trans_real.py:413
msgid "DATETIME_FORMAT"
msgstr "d.m.Y H:i"
-#: utils/translation/trans_real.py:406
+#: utils/translation/trans_real.py:414
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:422
+#: utils/translation/trans_real.py:430
msgid "YEAR_MONTH_FORMAT"
msgstr "d.m.Y"
-#: utils/translation/trans_real.py:423
+#: utils/translation/trans_real.py:431
msgid "MONTH_DAY_FORMAT"
msgstr "d.m.Y"
@@ -4510,3 +4521,6 @@ msgstr "%(verbose_name)s წარმატებით შეიცვალა
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s წაიშალა."
+
+#~ msgid "Brazilian"
+#~ msgstr "ბრაზილიური"
diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo
index 3797766bc9..fe68cd416f 100644
Binary files a/django/conf/locale/nl/LC_MESSAGES/django.mo and b/django/conf/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/nl/LC_MESSAGES/django.po b/django/conf/locale/nl/LC_MESSAGES/django.po
index 13143c5b8b..7aa8d3fe83 100644
--- a/django/conf/locale/nl/LC_MESSAGES/django.po
+++ b/django/conf/locale/nl/LC_MESSAGES/django.po
@@ -1,201 +1,213 @@
+# Dutch translation for Django.
+# Copyright (C) 2008, Django Software Foundation
+# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-27 08:53+0100\n"
-"PO-Revision-Date: 2008-02-27 11:22+0100\n"
-"Last-Translator: jdetaeye \n"
+"POT-Creation-Date: 2008-07-30 02:28+0200\n"
+"PO-Revision-Date: 2008-07-31 23:08+0200\n"
+"Last-Translator: Rudolph Froger \n"
"Language-Team: \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"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:44
msgid "Arabic"
msgstr "Arabisch"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:45
msgid "Bengali"
msgstr "Bengaals"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:46
msgid "Bulgarian"
msgstr "Bulgaars"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:47
msgid "Catalan"
msgstr "Catalaans"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:48
msgid "Czech"
msgstr "Tjechisch"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:49
msgid "Welsh"
msgstr "Wels"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:50
msgid "Danish"
msgstr "Deens"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:51
msgid "German"
msgstr "Duits"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:52
msgid "Greek"
msgstr "Grieks"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
msgid "English"
msgstr "Engels"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:54
msgid "Spanish"
msgstr "Spaans"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:55
+msgid "Estonian"
+msgstr "Ests"
+
+#: conf/global_settings.py:56
msgid "Argentinean Spanish"
msgstr "Argentijns Spaans"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:57
msgid "Basque"
msgstr "Baskisch"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:58
msgid "Persian"
msgstr "Perzisch"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:59
msgid "Finnish"
msgstr "Fins"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:60
msgid "French"
msgstr "Frans"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:61
msgid "Irish"
msgstr "Iers"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:62
msgid "Galician"
msgstr "Galicisch"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:63
msgid "Hungarian"
msgstr "Hongaars"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:64
msgid "Hebrew"
msgstr "Hebreews"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:65
msgid "Croatian"
msgstr "Kroatisch"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:66
msgid "Icelandic"
msgstr "IJslands"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:67
msgid "Italian"
msgstr "Italiaans"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:68
msgid "Japanese"
msgstr "Japans"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:69
msgid "Georgian"
msgstr "Georgisch"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:70
msgid "Korean"
msgstr "Koreaans"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:71
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:72
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:73
msgid "Latvian"
msgstr "Lets"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:74
+msgid "Lithuanian"
+msgstr "Litouws"
+
+#: conf/global_settings.py:75
msgid "Macedonian"
msgstr "Macedonisch"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:76
msgid "Dutch"
msgstr "Nederlands"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:77
msgid "Norwegian"
msgstr "Noors"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:78
msgid "Polish"
msgstr "Pools"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:79
msgid "Portugese"
msgstr "Portugees"
-#: conf/global_settings.py:73
-msgid "Brazilian"
-msgstr "Braziliaans"
+#: conf/global_settings.py:80
+msgid "Brazilian Portuguese"
+msgstr "Braziliaans Portugees"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:81
msgid "Romanian"
msgstr "Roemeens"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:82
msgid "Russian"
msgstr "Russisch"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:83
msgid "Slovak"
msgstr "Slovaaks"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:84
msgid "Slovenian"
msgstr "Sloveens"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:85
msgid "Serbian"
msgstr "Servisch"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:86
msgid "Swedish"
msgstr "Zweeds"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:87
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:88
msgid "Telugu"
msgstr "Telegu"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:89
msgid "Turkish"
msgstr "Turks"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:90
msgid "Ukrainian"
msgstr "Oekraïens"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:91
msgid "Simplified Chinese"
msgstr "Vereenvoudigd Chinees"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:92
msgid "Traditional Chinese"
msgstr "Traditioneel Chinees"
@@ -208,10 +220,8 @@ msgstr ""
"
Door %s:
\n"
"
\n"
-#: contrib/admin/filterspecs.py:74
-#: contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147
-#: contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
msgid "All"
msgstr "Alle"
@@ -235,51 +245,205 @@ msgstr "Deze maand"
msgid "This year"
msgstr "Dit jaar"
-#: contrib/admin/filterspecs.py:147
-#: newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Yes"
msgstr "Ja"
-#: contrib/admin/filterspecs.py:147
-#: newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "No"
msgstr "Nee"
-#: contrib/admin/filterspecs.py:154
-#: newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Unknown"
msgstr "Onbekend"
-#: contrib/admin/models.py:18
+#: contrib/admin/models.py:19
msgid "action time"
-msgstr "actie tijd"
+msgstr "actietijd"
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
msgid "object id"
-msgstr "object id"
+msgstr "object-id"
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
msgid "object repr"
-msgstr "object repr"
+msgstr "object-repr"
-#: contrib/admin/models.py:23
+#: contrib/admin/models.py:24
msgid "action flag"
-msgstr "actie vlag"
+msgstr "actievlag"
-#: contrib/admin/models.py:24
+#: contrib/admin/models.py:25
msgid "change message"
msgstr "wijzig bericht"
-#: contrib/admin/models.py:27
+#: contrib/admin/models.py:28
msgid "log entry"
-msgstr "log ingave"
+msgstr "logingave"
-#: contrib/admin/models.py:28
+#: contrib/admin/models.py:29
msgid "log entries"
-msgstr "log ingaves"
+msgstr "logingaves"
+
+#: contrib/admin/options.py:161 contrib/admin/options.py:180
+msgid "None"
+msgstr "Geen"
+
+#: contrib/admin/options.py:347 contrib/auth/admin.py:37
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "De %(name)s \"%(obj)s\" is toegevoegd."
+
+#: contrib/admin/options.py:351 contrib/admin/options.py:419
+#: contrib/auth/admin.py:42
+msgid "You may edit it again below."
+msgstr "U kunt dit hieronder weer bewerken."
+
+#: contrib/admin/options.py:361 contrib/admin/options.py:428
+#, python-format
+msgid "You may add another %s below."
+msgstr "U kunt hieronder de volgende %s toevoegen."
+
+#: contrib/admin/options.py:395
+#, python-format
+msgid "Changed %s."
+msgstr "%s gewijzigd."
+
+#: contrib/admin/options.py:395 contrib/admin/options.py:405
+#: core/validators.py:279 db/models/manipulators.py:305
+msgid "and"
+msgstr "en"
+
+#: contrib/admin/options.py:400
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "%(name)s \"%(object)s\" toegevoegd."
+
+#: contrib/admin/options.py:404
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "%(list)s aangepast voor %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:409
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "%(name)s \"%(object)s\" verwijderd."
+
+#: contrib/admin/options.py:414
+msgid "No fields changed."
+msgstr "Geen velden gewijzigd."
+
+#: contrib/admin/options.py:417
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Het wijzigen van %(name)s \"%(obj)s\" is geslaagd."
+
+#: contrib/admin/options.py:425
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "De %(name)s \"%(obj)s\" was toegevoegd. U kunt het hieronder wijzigen."
+
+#: contrib/admin/options.py:506
+#, python-format
+msgid "Add %s"
+msgstr "Toevoegen %s"
+
+#: contrib/admin/options.py:568
+#, python-format
+msgid "Change %s"
+msgstr "Wijzig %s"
+
+#: contrib/admin/options.py:598
+msgid "Database error"
+msgstr "Databasefout"
+
+#: contrib/admin/options.py:647
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "De verwijdering van %(name)s \"%(obj)s\" is geslaagd."
+
+#: contrib/admin/options.py:653
+msgid "Are you sure?"
+msgstr "Weet u het zeker?"
+
+#: contrib/admin/options.py:680
+#, python-format
+msgid "Change history: %s"
+msgstr "Wijzigingsgeschiedenis: %s"
+
+#: contrib/admin/sites.py:18 contrib/admin/views/decorators.py:16
+#: contrib/auth/forms.py:70 contrib/comments/views/comments.py:56
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Voer een correcte gebruikersnaam en wachtwoord in. Let op, de velden zijn "
+"hoofdletter-gevoelig."
+
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:68
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Uw sessie is verlopen, meld u opnieuw aan. Maakt u zich geen zorgen: Uw "
+"bijdrage is opgeslagen."
+
+#: contrib/admin/sites.py:240 contrib/admin/views/decorators.py:75
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Het lijkt erop dat uw browser geen cookies accepteert. Zet het gebruik van "
+"cookies aan in uw browser, laad deze pagina nogmaals en probeer het opnieuw."
+
+#: contrib/admin/sites.py:254 contrib/admin/sites.py:260
+#: contrib/admin/views/decorators.py:92
+msgid "Usernames cannot contain the '@' character."
+msgstr "Gebruikersnamen mogen geen '@' bevatten."
+
+#: contrib/admin/sites.py:257 contrib/admin/views/decorators.py:88
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Uw e-mailadres is niet uw gebruikersnaam. Probeer '%s' eens."
+
+#: contrib/admin/sites.py:325
+msgid "Site administration"
+msgstr "Sitebeheer"
+
+#: contrib/admin/sites.py:347 contrib/admin/templates/admin/login.html:27
+#: contrib/admin/views/decorators.py:30
+msgid "Log in"
+msgstr "Inloggen"
+
+#: contrib/admin/util.py:126
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Een of meer %(fieldname)s in %(name)s: %(obj)s"
+
+#: contrib/admin/util.py:131
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Een of meer %(fieldname)s in %(name)s:"
+
+#: contrib/admin/widgets.py:65
+msgid "Date:"
+msgstr "Datum:"
+
+#: contrib/admin/widgets.py:65
+msgid "Time:"
+msgstr "Tijd:"
+
+#: contrib/admin/widgets.py:89
+msgid "Currently:"
+msgstr "Huidige:"
+
+#: contrib/admin/widgets.py:89
+msgid "Change:"
+msgstr "Wijziging:"
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
@@ -291,17 +455,17 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Onze excuses, maar de gevraagde pagina bestaat niet."
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:37
-#: contrib/admin/templates/admin/change_form.html:12
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:4
-#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
msgid "Home"
@@ -309,98 +473,115 @@ msgstr "Voorpagina"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
-msgstr "Server fout"
+msgstr "Serverfout"
#: contrib/admin/templates/admin/500.html:6
msgid "Server error (500)"
-msgstr "Server fout (500)"
+msgstr "Serverfout (500)"
#: contrib/admin/templates/admin/500.html:9
msgid "Server Error (500)"
-msgstr "Server Fout (500)"
+msgstr "Serverfout (500)"
#: 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 "Er is een fout opgetreden. Dit is inmiddels doorgegeven aan de sitebeheerder via e-mail en zal spoedig worden gerepareerd. Bedankt voor uw geduld."
+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 ""
+"Er is een fout opgetreden. Dit is inmiddels doorgegeven aan de sitebeheerder "
+"via e-mail en zal spoedig worden gerepareerd. Bedankt voor uw geduld."
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:25
msgid "Welcome,"
msgstr "Welkom,"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:25
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Documentation"
msgstr "Documentatie"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:45
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:13
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Change password"
msgstr "Wachtwoord wijzigen"
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/comments/templates/comments/form.html:6
msgid "Log out"
msgstr "Afmelden"
#: contrib/admin/templates/admin/base_site.html:4
msgid "Django site admin"
-msgstr "Django site beheer"
+msgstr "Django sitebeheer"
#: contrib/admin/templates/admin/base_site.html:7
msgid "Django administration"
-msgstr "Django beheer"
+msgstr "Djangobeheer"
-#: contrib/admin/templates/admin/change_form.html:14
-#: contrib/admin/templates/admin/index.html:28
+#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/index.html:29
msgid "Add"
msgstr "Toevoegen"
-#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/change_form.html:26
+#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Geschiedenis"
-#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/change_form.html:27
msgid "View on site"
msgstr "Toon op site"
-#: contrib/admin/templates/admin/change_form.html:31
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:37
+#: contrib/admin/templates/admin/auth/user/change_password.html:22
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Herstel de fout hieronder."
msgstr[1] "Herstel de fouten hieronder."
-#: contrib/admin/templates/admin/change_form.html:49
-msgid "Ordering"
-msgstr "Sortering"
-
-#: contrib/admin/templates/admin/change_form.html:52
-msgid "Order:"
-msgstr "Sortering:"
-
-#: contrib/admin/templates/admin/change_list.html:11
+#: contrib/admin/templates/admin/change_list.html:16
#, python-format
msgid "Add %(name)s"
msgstr "%(name)s toevoegen"
-#: contrib/admin/templates/admin/delete_confirmation.html:8
+#: contrib/admin/templates/admin/change_list.html:26
+msgid "Filter"
+msgstr "Filter"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:9
#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
msgid "Delete"
msgstr "Verwijderen"
-#: contrib/admin/templates/admin/delete_confirmation.html:13
+#: contrib/admin/templates/admin/delete_confirmation.html:15
#, 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 "Het verwijderen van %(object_name)s '%(escaped_object)s' zal ook gerelateerde objecten verwijderen. Echter u heeft geen rechten om de volgende typen objecten te verwijderen:"
+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 ""
+"Het verwijderen van %(object_name)s '%(escaped_object)s' zal ook "
+"gerelateerde objecten verwijderen. Echter u heeft geen rechten om de "
+"volgende typen objecten te verwijderen:"
-#: contrib/admin/templates/admin/delete_confirmation.html:20
+#: contrib/admin/templates/admin/delete_confirmation.html:22
#, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
-msgstr "Weet u zeker dat u %(object_name)s \"%(escaped_object)s\" wilt verwijderen? Alle volgende objecten worden verwijderd:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+"Weet u zeker dat u %(object_name)s \"%(escaped_object)s\" wilt verwijderen? "
+"Alle volgende objecten worden verwijderd:"
-#: contrib/admin/templates/admin/delete_confirmation.html:25
+#: contrib/admin/templates/admin/delete_confirmation.html:27
msgid "Yes, I'm sure"
msgstr "Ja, ik weet het zeker"
@@ -409,79 +590,79 @@ msgstr "Ja, ik weet het zeker"
msgid " By %(filter_title)s "
msgstr " Op %(filter_title)s "
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filter"
-
-#: contrib/admin/templates/admin/index.html:17
+#: contrib/admin/templates/admin/index.html:18
#, python-format
msgid "Models available in the %(name)s application."
msgstr "Beschikbare modellen in de %(name)s toepassing."
-#: contrib/admin/templates/admin/index.html:18
+#: contrib/admin/templates/admin/index.html:19
#, python-format
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/index.html:34
+#: contrib/admin/templates/admin/index.html:35
msgid "Change"
msgstr "Wijzigen"
-#: contrib/admin/templates/admin/index.html:44
+#: contrib/admin/templates/admin/index.html:45
msgid "You don't have permission to edit anything."
msgstr "U heeft geen rechten om iets te wijzigen."
-#: contrib/admin/templates/admin/index.html:52
+#: contrib/admin/templates/admin/index.html:53
msgid "Recent Actions"
msgstr "Recente acties"
-#: contrib/admin/templates/admin/index.html:53
+#: contrib/admin/templates/admin/index.html:54
msgid "My Actions"
msgstr "Mijn acties"
-#: contrib/admin/templates/admin/index.html:57
+#: contrib/admin/templates/admin/index.html:58
msgid "None available"
msgstr "Geen beschikbaar"
-#: contrib/admin/templates/admin/invalid_setup.html:8
-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 "Er is iets mis met de database. Verzeker u ervan dat de benodigde tabellen zijn aangemaakt en dat de database toegankelijk is voor de juiste gebruiker."
+#: 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 ""
+"Er is iets mis met de database. Verzeker u ervan dat de benodigde tabellen "
+"zijn aangemaakt en dat de database toegankelijk is voor de juiste gebruiker."
-#: contrib/admin/templates/admin/login.html:17
+#: contrib/admin/templates/admin/login.html:19
#: contrib/comments/templates/comments/form.html:6
#: contrib/comments/templates/comments/form.html:8
msgid "Username:"
msgstr "Gebruikersnaam:"
-#: contrib/admin/templates/admin/login.html:20
+#: contrib/admin/templates/admin/login.html:22
#: contrib/comments/templates/comments/form.html:8
msgid "Password:"
msgstr "Wachtwoord:"
-#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:31
-msgid "Log in"
-msgstr "Aanmelden"
-
-#: contrib/admin/templates/admin/object_history.html:17
+#: contrib/admin/templates/admin/object_history.html:16
msgid "Date/time"
msgstr "Datum/tijd"
-#: contrib/admin/templates/admin/object_history.html:18
+#: contrib/admin/templates/admin/object_history.html:17
msgid "User"
msgstr "Gebruiker"
-#: contrib/admin/templates/admin/object_history.html:19
+#: contrib/admin/templates/admin/object_history.html:18
msgid "Action"
msgstr "Actie"
-#: contrib/admin/templates/admin/object_history.html:25
+#: contrib/admin/templates/admin/object_history.html:24
msgid "DATE_WITH_TIME_FULL"
msgstr "d-n-Y H:i:s"
-#: contrib/admin/templates/admin/object_history.html:35
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "Dit object heeft geen wijzigingsgeschiedenis. Het is mogelijk niet via de admin site toegevoegd."
+#: contrib/admin/templates/admin/object_history.html:32
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Dit object heeft geen wijzigingsgeschiedenis. Het is mogelijk niet via de "
+"admin site toegevoegd."
#: contrib/admin/templates/admin/pagination.html:10
msgid "Show all"
@@ -520,29 +701,36 @@ msgid "Save"
msgstr "Opslaan"
#: 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."
-msgstr "Vul allereerst een gebruikersnaam en wachtwoord in. Vervolgens kunt u de andere opties instellen."
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+"Vul allereerst een gebruikersnaam en wachtwoord in. Vervolgens kunt u de "
+"andere opties instellen."
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
+#: contrib/admin/templates/admin/auth/user/add_form.html:13
+#: contrib/auth/forms.py:12 contrib/auth/forms.py:49
msgid "Username"
msgstr "Gebruikersnaam"
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/add_form.html:20
#: contrib/admin/templates/admin/auth/user/change_password.html:33
+#: contrib/auth/forms.py:15 contrib/auth/forms.py:50 contrib/auth/forms.py:166
msgid "Password"
msgstr "Wachtwoord"
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:38
+#: contrib/admin/templates/admin/auth/user/add_form.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/auth/forms.py:167
msgid "Password (again)"
msgstr "Wachtwoord (nogmaals)"
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: 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 "Vul hetzelfde wachtwoord als hierboven in, ter bevestiging."
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:26
#, python-format
msgid "Enter a new password for the user %(username)s."
msgstr "Geef een nieuw passwoord voor gebruiker %(username)s."
@@ -566,27 +754,40 @@ msgid ""
"your computer is \"internal\").
\n"
msgstr ""
"\n"
-"
Om bookmarklets te installeren, sleep de link naar uw bladwijzers\n"
-"werkbalk, of rechtermuis klik op de link en voeg het toe aan de bladwijzer. Nu kan\n"
-"de bookmarklet vanuit elke pagina op de site worden gekozen. Let erop dat het soms\n"
-"noodzakelijk is dat de computer van waaruit de pagina wordt bekeken intern is.\n"
-"(Raadpleeg uw systeembeheerder of uw computer zich op het interne netwerk bevind).
\n"
+"
Om bookmarklets te installeren, sleep de link naar uw "
+"bladwijzers\n"
+"werkbalk, of rechtermuis klik op de link en voeg het toe aan de bladwijzer. "
+"Nu kan\n"
+"de bookmarklet vanuit elke pagina op de site worden gekozen. Let erop dat "
+"het soms\n"
+"noodzakelijk is dat de computer van waaruit de pagina wordt bekeken intern "
+"is.\n"
+"(Raadpleeg uw systeembeheerder of uw computer zich op het interne netwerk "
+"bevind).
\n"
msgstr ""
-"Dette feltet kan bare inneholde bokstaver, nummer, understreker, bindestreker"
-" eller skråstreker."
+"
Av %s:
\n"
+"
\n"
-#: core/validators.py:79
-msgid "This value must contain only letters, numbers, underscores or hyphens."
-msgstr "Dette feltet kan bare inneholde bokstaver, nummer, understreker eller "
-"bindestreker."
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+msgid "All"
+msgstr "Alle"
-#: core/validators.py:83
-msgid "Uppercase letters are not allowed here."
-msgstr "Store bokstaver er ikke tillatt her."
+#: contrib/admin/filterspecs.py:113
+msgid "Any date"
+msgstr "Når som helst"
-#: core/validators.py:87
-msgid "Lowercase letters are not allowed here."
-msgstr "Små bokstaver er ikke tillatt her."
+#: contrib/admin/filterspecs.py:114
+msgid "Today"
+msgstr "I dag"
-#: core/validators.py:94
-msgid "Enter only digits separated by commas."
-msgstr "Skriv inn bare tall, adskilt med komma."
+#: contrib/admin/filterspecs.py:117
+msgid "Past 7 days"
+msgstr "Siste 7 dager"
-#: core/validators.py:106
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Skriv inn e-postadresser, adskilt med komma."
+#: contrib/admin/filterspecs.py:119
+msgid "This month"
+msgstr "Denne måneden"
-#: core/validators.py:110
-msgid "Please enter a valid IP address."
-msgstr "Vennligst skriv inn en gyldig IP-adresse."
+#: contrib/admin/filterspecs.py:121
+msgid "This year"
+msgstr "I år"
-#: core/validators.py:114
-msgid "Empty values are not allowed here."
-msgstr "Dette felte kan ikke være tomt."
+#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: oldforms/__init__.py:592
+msgid "Yes"
+msgstr "Ja"
-#: core/validators.py:118
-msgid "Non-numeric characters aren't allowed here."
-msgstr "Dette feltet kan kun bestå av tall."
+#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: oldforms/__init__.py:592
+msgid "No"
+msgstr "Nei"
-#: core/validators.py:122
-msgid "This value can't be comprised solely of digits."
-msgstr "Dette feltet kan ikke bare bestå av nummer."
+#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
+#: oldforms/__init__.py:592
+msgid "Unknown"
+msgstr "Ukjent"
-#: core/validators.py:127 newforms/fields.py:142
-msgid "Enter a whole number."
-msgstr "Skriv inn et helt nummer."
+#: contrib/admin/models.py:18
+msgid "action time"
+msgstr "tid for handling"
-#: core/validators.py:131
-msgid "Only alphabetical characters are allowed here."
-msgstr "Bare alfabetiske tegn er tillatt her."
+#: contrib/admin/models.py:21
+msgid "object id"
+msgstr "objekt-ID"
-#: core/validators.py:146
-msgid "Year must be 1900 or later."
-msgstr "År må være 1900 eller senere."
+#: contrib/admin/models.py:22
+msgid "object repr"
+msgstr "objekt repr"
-#: core/validators.py:150
-#, python-format
-msgid "Invalid date: %s"
-msgstr "Ugyldig dato: %s"
+#: contrib/admin/models.py:23
+msgid "action flag"
+msgstr "handlingsflagg"
-#: core/validators.py:160
-msgid "Enter a valid time in HH:MM format."
-msgstr "Skriv inn tiden i TT:MM format."
+#: contrib/admin/models.py:24
+msgid "change message"
+msgstr "endre melding"
-#: core/validators.py:169 newforms/fields.py:336
-msgid "Enter a valid e-mail address."
-msgstr "Skriv inn en godkjent e-postadresse."
+#: contrib/admin/models.py:27
+msgid "log entry"
+msgstr "logginnlegg"
-#: core/validators.py:181 core/validators.py:461 oldforms/__init__.py:686
-#: newforms/fields.py:376
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Ingen fil ble "
+#: contrib/admin/models.py:28
+msgid "log entries"
+msgstr "logginnlegg"
-#: core/validators.py:185 newforms/fields.py:397
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-"Last opp et gyldig bilde. Filen du lastet opp var ikke et bilde, eller så var"
-" det det ødelagt."
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Fant ikke siden"
-#: core/validators.py:192
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "Internettadressen %s peker ikke til et gyldig bilde."
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Beklager, men siden du spør etter finnes ikke."
-#: core/validators.py:196
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr ""
-"Telefonnummeret må være i XXX-XXX-XXXX format. \"%s\" er ugyldig."
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:37
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/invalid_setup.html:4
+#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+msgid "Home"
+msgstr "Hjem"
-#: core/validators.py:204
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "Internettadressen %s peker ikke til en gyldig QuickTime-video."
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Tjenerfeil"
-#: core/validators.py:208
-msgid "A valid URL is required."
-msgstr "En gyldig internettadresse er påkrevd."
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Tjenerfeil (500)"
-#: core/validators.py:222
-#, python-format
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error (500)"
+msgstr "Tjenerfeil (500)"
+
+#: contrib/admin/templates/admin/500.html:10
msgid ""
-"Valid HTML is required. Specific errors are:\n"
-"%s"
+"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 ""
-"Gyldig HTML er påkrevd. Feilene var:\n"
-"%s"
-
-#: core/validators.py:229
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "Ikke velformet XML: %s"
-
-#: core/validators.py:246
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "Ugyldig URL: %s"
+"Det har oppstått en feil. Feilen er blitt rapportert til administrator via e-"
+"post, og vil bli fikset snart. Takk for din tålmodighet."
-#: core/validators.py:251 core/validators.py:253
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "Internettadresse %s fører til en side som ikke eksisterer."
+#: contrib/admin/templates/admin/base.html:26
+msgid "Welcome,"
+msgstr "Velkommen,"
-#: core/validators.py:259
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Skriv inn en godkjent amerikansk delstatsforkortelse."
+#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "Dokumentasjon"
-#: core/validators.py:273
-#, 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] "Pass munnen din! Ordet %s er ikke tillatt her."
-msgstr[1] "Pass munnen din! Ordene %s er ikke tillatt her."
+#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/auth/user/change_password.html:14
+#: contrib/admin/templates/admin/auth/user/change_password.html:45
+msgid "Change password"
+msgstr "Endre passord"
-#: core/validators.py:280
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Dette feltet må være det samme som i '%s'-feltet."
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/comments/templates/comments/form.html:6
+msgid "Log out"
+msgstr "Logg ut"
-#: core/validators.py:299
-msgid "Please enter something for at least one field."
-msgstr "Vennligst skriv inn noe i minst et felt."
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django administrasjonsside"
-#: core/validators.py:308 core/validators.py:319
-msgid "Please enter both fields or leave them both empty."
-msgstr "Vennligst skriv inn noe i begge felta, eller la dem stå blanke."
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django-administrasjon"
-#: core/validators.py:327
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr "Dette feltet må bare brukes hvis %(field)s er lik %(value)s"
+#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/index.html:28
+msgid "Add"
+msgstr "Legg til"
-#: core/validators.py:340
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
-msgstr "Dette feltet må bare brukes hvis %(field)s ikke er lik %(value)s"
+#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/object_history.html:4
+msgid "History"
+msgstr "Historikk"
-#: core/validators.py:359
-msgid "Duplicate values are not allowed."
-msgstr "Like verdier er ikke tillatt."
+#: contrib/admin/templates/admin/change_form.html:21
+msgid "View on site"
+msgstr "Vis på nettsted"
-#: core/validators.py:374
-#, python-format
-msgid "This value must be between %(lower)s and %(upper)s."
-msgstr "Denne verdien må være mellom %(lower)s og %(upper)s."
+#: contrib/admin/templates/admin/change_form.html:31
+#: 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] "Vennligst fiks feilen under."
+msgstr[1] "Vennligst fiks feilene under."
-#: core/validators.py:376
-#, python-format
-msgid "This value must be at least %s."
-msgstr "Denne verdien må minst være %s."
+#: contrib/admin/templates/admin/change_form.html:49
+msgid "Ordering"
+msgstr "Rekkefølge"
-#: core/validators.py:378
-#, python-format
-msgid "This value must be no more than %s."
-msgstr "Denne verdien kan ikke være mer enn %s."
+#: contrib/admin/templates/admin/change_form.html:52
+msgid "Order:"
+msgstr "Rekkefølge:"
-#: core/validators.py:414
+#: contrib/admin/templates/admin/change_list.html:11
#, python-format
-msgid "This value must be a power of %s."
-msgstr "Denne verdien må være et kvadrat av %s."
+msgid "Add %(name)s"
+msgstr "Legg til %(name)s"
-#: core/validators.py:424
-msgid "Please enter a valid decimal number."
-msgstr "Vennligst skriv inn et gyldig desimaltall."
+#: contrib/admin/templates/admin/delete_confirmation.html:8
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "Slett"
-#: core/validators.py:431
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s total digits."
-msgstr[0] "Skriv inn et desimaltall med maks %s siffer."
-msgstr[1] "Skriv inn et desimaltall med maks %s siffer."
+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 ""
+"Hvis du sletter %(object_name)s '%(escaped_object)s', vil også slette "
+"relaterte objekter, men du har ikke tillatelse til å slette følgende "
+"objekttyper:"
-#: core/validators.py:434
+#: contrib/admin/templates/admin/delete_confirmation.html:20
#, python-format
msgid ""
-"Please enter a valid decimal number with a whole part of at most %s digit."
-msgid_plural ""
-"Please enter a valid decimal number with a whole part of at most %s digits."
-msgstr[0] "Skriv inn et desimaltall hvor heltallsdelen er maks %s siffer."
-msgstr[1] "Skriv inn et desimaltall hvor heltallsdelen er maks %s siffer."
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+"Er du sikker på at du vil slette %(object_name)s \"%(escaped_object)s\"? "
+"Alle de følgende relaterte objektene vil bli slettet:"
-#: core/validators.py:437
+#: contrib/admin/templates/admin/delete_confirmation.html:25
+msgid "Yes, I'm sure"
+msgstr "Ja, jeg er sikker"
+
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] "Skriv inn et desimaltall med maks %s siffer bak komma."
-msgstr[1] "Skriv inn et desimaltall med maks %s siffer bak komma."
+msgid " By %(filter_title)s "
+msgstr "Av %(filter_title)s "
-#: core/validators.py:445
-msgid "Please enter a valid floating point number."
-msgstr "Vennligst skriv inn et gyldig flyttall."
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "Filtrering"
-#: core/validators.py:454
+#: contrib/admin/templates/admin/index.html:17
#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Vær sikker på at fila du prøver å laste opp minst er %s bytes stor."
+msgid "Models available in the %(name)s application."
+msgstr "Modeller tilgjengelig i %(name)s-applikasjonen."
-#: core/validators.py:455
+#: contrib/admin/templates/admin/index.html:18
#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Vær sikker på at fila du prøver å laste opp ikke er mer enn %s bytes"
-" stor."
+msgid "%(name)s"
+msgstr "%(name)s"
-#: core/validators.py:472
-msgid "The format for this field is wrong."
-msgstr "Formatet i dette feltet er feil."
+#: contrib/admin/templates/admin/index.html:34
+msgid "Change"
+msgstr "Endre"
-#: core/validators.py:487
-msgid "This field is invalid."
-msgstr "Dette feltet er ugyldig."
+#: contrib/admin/templates/admin/index.html:44
+msgid "You don't have permission to edit anything."
+msgstr "Du har ikke rettigheter til å endre noe."
-#: core/validators.py:523
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "Klarte ikke å hente noe fra %s."
+#: contrib/admin/templates/admin/index.html:52
+msgid "Recent Actions"
+msgstr "Siste handlinger"
-#: core/validators.py:526
-#, python-format
-msgid ""
-"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr ""
-"Internettadressen %(url)s returnerte den ugyldige Content-Type-headeren "
-"'%(contenttype)s'."
+#: contrib/admin/templates/admin/index.html:53
+msgid "My Actions"
+msgstr "Mine handlinger"
-#: core/validators.py:559
-#, python-format
-msgid ""
-"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
-"\"%(start)s\".)"
-msgstr ""
-"Vennligst lukk taggen %(tag)s på linje %(line)s. (Linjen starer med "
-"\"%(start)s\".)"
+#: contrib/admin/templates/admin/index.html:57
+msgid "None available"
+msgstr "Ingen tilgjengelige"
-#: core/validators.py:563
-#, python-format
+#: contrib/admin/templates/admin/invalid_setup.html:8
msgid ""
-"Some text starting on line %(line)s is not allowed in that context. (Line "
-"starts with \"%(start)s\".)"
+"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 ""
-"Noe av teksten som starter på linje %(line)s er ikke tillatt. (Linjen "
-"starter med \"%(start)s\".)"
+"Noe er galt med databaseinstallasjonen din. Sørg for at databasetabellene er "
+"opprettet og at brukeren har de nødvendige rettigheter."
-#: core/validators.py:568
-#, python-format
-msgid ""
-"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"\"%(attr)s\" på linje %(line)s er et ugyldig attributt. (Linjen starter "
-"med \"%(start)s\".)"
+#: contrib/admin/templates/admin/login.html:17
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+msgid "Username:"
+msgstr "Brukernavn:"
-#: core/validators.py:573
-#, python-format
-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 ugyldig element. (Linjen starter med "
-"\"%(start)s\".)"
+#: contrib/admin/templates/admin/login.html:20
+#: contrib/comments/templates/comments/form.html:8
+msgid "Password:"
+msgstr "Passord:"
-#: core/validators.py:577
-#, python-format
-msgid ""
-"A tag on line %(line)s is missing one or more required attributes. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"Et element på linje %(line)s mangler et av de påkrevde attributtene. (Linjen "
-"starter med \"%(start)s\".)"
+#: contrib/admin/templates/admin/login.html:25
+#: contrib/admin/views/decorators.py:31
+msgid "Log in"
+msgstr "Logg inn"
-#: core/validators.py:582
-#, python-format
+#: contrib/admin/templates/admin/object_history.html:17
+msgid "Date/time"
+msgstr "Dato/tid"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "User"
+msgstr "Bruker"
+
+#: contrib/admin/templates/admin/object_history.html:19
+msgid "Action"
+msgstr "Handling"
+
+#: contrib/admin/templates/admin/object_history.html:25
+msgid "DATE_WITH_TIME_FULL"
+msgstr "H:i, j. M Y"
+
+#: contrib/admin/templates/admin/object_history.html:35
msgid ""
-"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
-"starts with \"%(start)s\".)"
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
msgstr ""
-"\"%(attr)s\"-attributtet på linje %(line)s har en ugyldig verdi. (Linjen "
-"starter med \"%(start)s\".)"
+"Dette objektet har ingen endringshistorikk. Det var sannsynligvis ikke lagt "
+"til via denne administrasjonssiden."
-#: views/generic/create_update.py:43
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s ble opprettet."
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Vis alle"
-#: views/generic/create_update.py:117
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s ble oppdatert."
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "Gå"
-#: views/generic/create_update.py:184
+#: contrib/admin/templates/admin/search_form.html:10
#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s ble slettet."
+msgid "1 result"
+msgid_plural "%(counter)s results"
+msgstr[0] "Ett resultat"
+msgstr[1] "%(counter)s resultat"
-#: utils/dates.py:6
-msgid "Monday"
-msgstr "Mandag"
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "%(full_result_count)s totalt"
-#: utils/dates.py:6
-msgid "Tuesday"
-msgstr "Tirsdag"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Lagre som ny"
-#: utils/dates.py:6
-msgid "Wednesday"
-msgstr "Onsdag"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Lagre og legg til ny"
-#: utils/dates.py:6
-msgid "Thursday"
-msgstr "Torsdag"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Lagre og fortsett å endre"
-#: utils/dates.py:6
-msgid "Friday"
-msgstr "Fredag"
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Lagre"
-#: utils/dates.py:7
-msgid "Saturday"
-msgstr "Lørdag"
+#: 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."
+msgstr ""
+"Skriv først inn brukernavn og passord. Deretter vil du få mulighet til å "
+"endre flere brukerinnstillinger."
-#: utils/dates.py:7
-msgid "Sunday"
-msgstr "Søndag"
+#: contrib/admin/templates/admin/auth/user/add_form.html:12
+msgid "Username"
+msgstr "Brukernavn"
-#: utils/dates.py:10
-msgid "Mon"
-msgstr "Man"
+#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/change_password.html:33
+msgid "Password"
+msgstr "Passord"
-#: utils/dates.py:10
-msgid "Tue"
-msgstr "Tirs"
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
+#: contrib/admin/templates/admin/auth/user/change_password.html:38
+msgid "Password (again)"
+msgstr "Passord (gjenta)"
-#: utils/dates.py:10
-msgid "Wed"
-msgstr "Ons"
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+msgid "Enter the same password as above, for verification."
+msgstr "Skriv inn det samme passordet som ovenfor, for verifisering."
-#: utils/dates.py:10
-msgid "Thu"
-msgstr "Tors"
+#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#, python-format
+msgid "Enter a new password for the user %(username)s."
+msgstr "Skriv inn et nytt passord for brukeren %(username)s."
-#: utils/dates.py:10
-msgid "Fri"
-msgstr "Fre"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Bokmerker"
-#: utils/dates.py:11
-msgid "Sat"
-msgstr "Lør"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+msgid "Documentation bookmarklets"
+msgstr "Dokumentasjonsbokmerker"
-#: utils/dates.py:11
-msgid "Sun"
-msgstr "Søn"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:8
+msgid ""
+"\n"
+"
To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site. Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").
\n"
+msgstr ""
+"\n"
+"
For å installere bokmerker, dra linken til verktøylinja\n"
+"for bokmerker, eller høyreklikk og legg til i bokmerker. Nå kan du du velge\n"
+"bokmerket fra hvilken som helst side på nettstedet. Noen av disse\n"
+"bokmerkene krever at datamaskinen du bruker er markert som \"intern\"\n"
+"(kontakt din systemadministrator hvis du er usikker på om maskinen din er "
+"\"intern\").
\n"
-#: utils/dates.py:18
-msgid "January"
-msgstr "Januar"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:18
+msgid "Documentation for this page"
+msgstr "Dokumentasjon for denne siden"
-#: utils/dates.py:18
-msgid "February"
-msgstr "Februar"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Hopp fra hvilken som helst side til dokumentasjonen for visningsfunksjonen "
+"som genererte den siden."
-#: utils/dates.py:18 utils/dates.py:31
-msgid "March"
-msgstr "Mars"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:21
+msgid "Show object ID"
+msgstr "Vis objekt-ID"
-#: utils/dates.py:18 utils/dates.py:31
-msgid "April"
-msgstr "April"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Viser \"content-type\" og en unik ID for sider som representerer et enkelt "
+"objekt."
-#: utils/dates.py:18 utils/dates.py:31
-msgid "May"
-msgstr "Mai"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:24
+msgid "Edit this object (current window)"
+msgstr "Endre dette objektet (nåværende vindu)"
-#: utils/dates.py:18 utils/dates.py:31
-msgid "June"
-msgstr "Juni"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+"Hopper til administrasjonssiden for sider som representerer et enkelt objekt."
-#: utils/dates.py:19 utils/dates.py:31
-msgid "July"
-msgstr "Juli"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:27
+msgid "Edit this object (new window)"
+msgstr "Endre dette objektet (nytt vindu)"
-#: utils/dates.py:19
-msgid "August"
-msgstr "August"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "As above, but opens the admin page in a new window."
+msgstr "Samme som over, men åpner administrasjonssiden i et nytt vindu."
-#: utils/dates.py:19
-msgid "September"
-msgstr "September"
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Takk for at du valgte å bruke kvalitetstid på nettstedet i dag."
-#: utils/dates.py:19
-msgid "October"
-msgstr "Oktober"
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Logg inn igjen"
-#: utils/dates.py:19
-msgid "November"
-msgstr "November"
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_form.html:5
+#: contrib/admin/templates/registration/password_change_form.html:9
+msgid "Password change"
+msgstr "Endre passord"
-#: utils/dates.py:20
-msgid "December"
-msgstr "Desember"
+#: contrib/admin/templates/registration/password_change_done.html:5
+#: contrib/admin/templates/registration/password_change_done.html:9
+msgid "Password change successful"
+msgstr "Passordet er endret"
-#: utils/dates.py:23
-msgid "jan"
-msgstr "jan"
+#: contrib/admin/templates/registration/password_change_done.html:11
+msgid "Your password was changed."
+msgstr "Ditt passord er endret."
-#: utils/dates.py:23
-msgid "feb"
-msgstr "feb"
+#: contrib/admin/templates/registration/password_change_form.html:11
+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 ""
+"Venligst skriv inn ditt gamle passord, av sikkerthetsårsaker. Skriv deretter "
+"inn ditt nye passord to ganger, slik at vi kan kontrollere at det er korrekt."
-#: utils/dates.py:23
-msgid "mar"
-msgstr "mar"
+#: contrib/admin/templates/registration/password_change_form.html:16
+msgid "Old password:"
+msgstr "Gammelt passord:"
-#: utils/dates.py:23
-msgid "apr"
-msgstr "apr"
+#: contrib/admin/templates/registration/password_change_form.html:18
+msgid "New password:"
+msgstr "Nytt passord:"
-#: utils/dates.py:23
-msgid "may"
-msgstr "mai"
+#: contrib/admin/templates/registration/password_change_form.html:20
+msgid "Confirm password:"
+msgstr "Gjenta nytt passord:"
-#: utils/dates.py:23
-msgid "jun"
-msgstr "jun"
+#: contrib/admin/templates/registration/password_change_form.html:22
+msgid "Change my password"
+msgstr "Endre passord"
-#: utils/dates.py:24
-msgid "jul"
-msgstr "jul"
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
+msgid "Password reset"
+msgstr "Tilbakestill passord"
-#: utils/dates.py:24
-msgid "aug"
-msgstr "aug"
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Passordet ble tilbakestilt"
-#: utils/dates.py:24
-msgid "sep"
-msgstr "sep"
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Vi har sendt deg et nytt passord til e-postadressen du oppgav. Du vil "
+"forhåpentligvis motta det snart."
-#: utils/dates.py:24
-msgid "oct"
-msgstr "okt"
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr ""
+"Du har mottatt denne e-posten fordi du har bedt om tilbakestillelse av "
+"passordet ditt"
-#: utils/dates.py:24
-msgid "nov"
-msgstr "nov"
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "for din konto hos %(site_name)s"
-#: utils/dates.py:24
-msgid "dec"
-msgstr "des"
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr "Ditt nye passord er: %(new_password)s"
-#: utils/dates.py:31
-msgid "Jan."
-msgstr "Jan."
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
+msgstr "Du kan endre dette passordet ved å gå til denne siden:"
-#: utils/dates.py:31
-msgid "Feb."
-msgstr "Feb."
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "Brukernavnet ditt, i tilfelle du har glemt det:"
-#: utils/dates.py:32
-msgid "Aug."
-msgstr "Aug."
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "Takk for at du bruker siden vår!"
-#: utils/dates.py:32
-msgid "Sept."
-msgstr "Sept."
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Hilsen %(site_name)s"
-#: utils/dates.py:32
-msgid "Oct."
-msgstr "Okt."
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Har du glemt passordet ditt? Skriv inn e-postadressen din under, så sender "
+"vi deg et nytt passord."
-#: utils/dates.py:32
-msgid "Nov."
-msgstr "Nov."
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "E-postadresse:"
-#: utils/dates.py:32
-msgid "Dec."
-msgstr "Des."
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Tilbakestill mitt passord"
-#: utils/timesince.py:12
-msgid "year"
-msgid_plural "years"
-msgstr[0] "år"
-msgstr[1] "år"
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "Dato:"
-#: utils/timesince.py:13
-msgid "month"
-msgid_plural "months"
-msgstr[0] "måned"
-msgstr[1] "måndeder"
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "Tid:"
-#: utils/timesince.py:14
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "uke"
-msgstr[1] "uker"
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr "Nå:"
-#: utils/timesince.py:15
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dag"
-msgstr[1] "dager"
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr "Endre:"
-#: utils/timesince.py:16
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "time"
-msgstr[1] "timer"
+#: contrib/admin/templatetags/admin_list.py:257
+msgid "All dates"
+msgstr "Alle datoer"
-#: utils/timesince.py:17
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minutt"
-msgstr[1] "minutter"
+#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" ble opprettet."
+
+#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
+#: contrib/admin/views/main.py:356
+msgid "You may edit it again below."
+msgstr "Du kan endre igjen under."
+
+#: contrib/admin/views/auth.py:31
+msgid "Add user"
+msgstr "Ny bruker"
-#: utils/timesince.py:39
+#: contrib/admin/views/auth.py:58
+msgid "Password changed successfully."
+msgstr "Passordet er endret."
+
+#: contrib/admin/views/auth.py:65
#, python-format
-msgid "%(number)d %(type)s"
+msgid "Change password: %s"
+msgstr "Endre passord: %s"
+
+#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på "
+"små og store bokstaver."
+
+#: contrib/admin/views/decorators.py:69
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
msgstr ""
+"Du må logge inn igjen, fordi økten din har gått ut. Slapp av, innlegget ditt "
+"ble lagret."
+
+#: contrib/admin/views/decorators.py:76
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Det ser ut som om nettleseren din ikke støtter informasjonskapsler "
+"('cookies'). Vennligst konfigurer nettleseren din og prøv igjen."
+
+#: contrib/admin/views/decorators.py:89
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "E-postadressen din er ikke brukernavnet ditt, prøv '%s' i stede."
+
+#: contrib/admin/views/decorators.py:93
+msgid "Usernames cannot contain the '@' character."
+msgstr "Brukernavnet kan ikke inneholde '@'."
+
+#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
+#: contrib/admin/views/doc.py:52
+msgid "tag:"
+msgstr "tag:"
+
+#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
+#: contrib/admin/views/doc.py:83
+msgid "filter:"
+msgstr "filter:"
+
+#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
+#: contrib/admin/views/doc.py:141
+msgid "view:"
+msgstr "view:"
+
+#: contrib/admin/views/doc.py:166
+#, python-format
+msgid "App %r not found"
+msgstr "Fant ikke applikasjonen %r"
+
+#: contrib/admin/views/doc.py:173
+#, python-format
+msgid "Model %(name)r not found in app %(label)r"
+msgstr "Fant ikke modellen %(name)r i applikasjonen %(label)r"
+
+#: contrib/admin/views/doc.py:185
+#, python-format
+msgid "the related `%(label)s.%(type)s` object"
+msgstr "det relaterte `%(label)s.%(type)s`-objektet"
+
+#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
+#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
+msgid "model:"
+msgstr "modell:"
+
+#: contrib/admin/views/doc.py:216
+#, python-format
+msgid "related `%(label)s.%(name)s` objects"
+msgstr "relaterte `%(label)s.%(name)s`-objekter"
+
+#: contrib/admin/views/doc.py:221
+#, python-format
+msgid "all %s"
+msgstr "alle %s"
+
+#: contrib/admin/views/doc.py:226
+#, python-format
+msgid "number of %s"
+msgstr "antall %s"
+
+#: contrib/admin/views/doc.py:231
+#, python-format
+msgid "Fields on %s objects"
+msgstr "Felter på %s-objekter"
+
+#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
+#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
+#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
+msgid "Integer"
+msgstr "Heltall"
+
+#: contrib/admin/views/doc.py:294
+msgid "Boolean (Either True or False)"
+msgstr "Boolsk (\"True\" eller \"False\")"
+
+#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Tekst (opp til %(max_length)s tegn)"
+
+#: contrib/admin/views/doc.py:296
+msgid "Comma-separated integers"
+msgstr "Heltall adskilt med komma"
+
+#: contrib/admin/views/doc.py:297
+msgid "Date (without time)"
+msgstr "Dato (uten tid)"
+
+#: contrib/admin/views/doc.py:298
+msgid "Date (with time)"
+msgstr "Dato/tid"
+
+#: contrib/admin/views/doc.py:299
+msgid "Decimal number"
+msgstr "Desimaltall"
+
+#: contrib/admin/views/doc.py:300
+msgid "E-mail address"
+msgstr "E-postadresse"
+
+#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
+#: contrib/admin/views/doc.py:305
+msgid "File path"
+msgstr "Filsti"
+
+#: contrib/admin/views/doc.py:303
+msgid "Floating point number"
+msgstr "Flyttall"
-#: utils/timesince.py:45
-#, python-format
-msgid ", %(number)d %(type)s"
-msgstr ""
+#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89
+msgid "IP address"
+msgstr "IP-adresse"
-#: utils/text.py:127
-msgid "or"
-msgstr "eller"
+#: contrib/admin/views/doc.py:309
+msgid "Boolean (Either True, False or None)"
+msgstr "Boolsk (\"True\", \"False\" eller \"None\")"
-#: utils/dateformat.py:41
-msgid "p.m."
-msgstr ""
+#: contrib/admin/views/doc.py:310
+msgid "Relation to parent model"
+msgstr "Relasjon til foreldermodell"
-#: utils/dateformat.py:42
-msgid "a.m."
-msgstr ""
+#: contrib/admin/views/doc.py:311
+msgid "Phone number"
+msgstr "Telefonnummer"
-#: utils/dateformat.py:47
-msgid "PM"
-msgstr ""
+#: contrib/admin/views/doc.py:316
+msgid "Text"
+msgstr "Tekst"
-#: utils/dateformat.py:48
-msgid "AM"
-msgstr ""
+#: contrib/admin/views/doc.py:317
+msgid "Time"
+msgstr "Tid"
-#: utils/dateformat.py:97
-msgid "midnight"
-msgstr "midnatt"
+#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:8
+msgid "URL"
+msgstr "Nettadresse"
-#: utils/dateformat.py:99
-msgid "noon"
-msgstr "middag"
+#: contrib/admin/views/doc.py:319
+msgid "U.S. state (two uppercase letters)"
+msgstr "Stat (i USA, to store bokstaver)"
-#: utils/translation/trans_real.py:391
-msgid "DATE_FORMAT"
-msgstr "j. M Y"
+#: contrib/admin/views/doc.py:320
+msgid "XML text"
+msgstr "XML-tekst"
-#: utils/translation/trans_real.py:392
-msgid "DATETIME_FORMAT"
-msgstr "h:i, j. M Y"
+#: contrib/admin/views/doc.py:346
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr "%s ser ikke ut til å være et urlpattern-objekt"
-#: utils/translation/trans_real.py:393
-msgid "TIME_FORMAT"
-msgstr "h:i"
+#: contrib/admin/views/main.py:233
+msgid "Site administration"
+msgstr "Nettstedsadministrasjon"
-#: utils/translation/trans_real.py:409
-msgid "YEAR_MONTH_FORMAT"
-msgstr "Y M"
+#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
+#, python-format
+msgid "You may add another %s below."
+msgstr "Du kan legge til en ny %s under."
-#: utils/translation/trans_real.py:410
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. M"
+#: contrib/admin/views/main.py:298
+#, python-format
+msgid "Add %s"
+msgstr "Ny %s"
-#: contrib/contenttypes/models.py:37
-msgid "python model class name"
-msgstr "python modell klasse navn"
+#: contrib/admin/views/main.py:344
+#, python-format
+msgid "Added %s."
+msgstr "La til %s."
-#: contrib/contenttypes/models.py:40
-msgid "content type"
-msgstr "innholdstype"
+#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
+#: contrib/admin/views/main.py:348 core/validators.py:283
+#: db/models/manipulators.py:309
+msgid "and"
+msgstr "og"
-#: contrib/contenttypes/models.py:41
-msgid "content types"
-msgstr "innholdstyper"
+#: contrib/admin/views/main.py:346
+#, python-format
+msgid "Changed %s."
+msgstr "Endret %s."
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "th"
-msgstr ""
+#: contrib/admin/views/main.py:348
+#, python-format
+msgid "Deleted %s."
+msgstr "Slettet %s."
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "st"
-msgstr ""
+#: contrib/admin/views/main.py:351
+msgid "No fields changed."
+msgstr "Ingen felt endret."
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "nd"
-msgstr ""
+#: contrib/admin/views/main.py:354
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" ble endret."
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "rd"
-msgstr ""
+#: contrib/admin/views/main.py:362
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under."
-#: contrib/humanize/templatetags/humanize.py:50
+#: contrib/admin/views/main.py:400
#, python-format
-msgid "%(value).1f million"
-msgid_plural "%(value).1f million"
-msgstr[0] "%(value).1f million"
-msgstr[1] "%(value).1f millioner"
+msgid "Change %s"
+msgstr "Endre %s"
-#: contrib/humanize/templatetags/humanize.py:53
+#: contrib/admin/views/main.py:487
#, python-format
-msgid "%(value).1f billion"
-msgid_plural "%(value).1f billion"
-msgstr[0] "%(value).1f milliard"
-msgstr[1] "%(value).1f milliarder"
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "En eller flere %(fieldname)s i %(name)s: %(obj)s"
-#: contrib/humanize/templatetags/humanize.py:56
+#: contrib/admin/views/main.py:492
#, python-format
-msgid "%(value).1f trillion"
-msgid_plural "%(value).1f trillion"
-msgstr[0] "%(value).1f billion"
-msgstr[1] "%(value).1f billioner"
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "En eller flere %(fieldname)s i %(name)s:"
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "one"
-msgstr "en"
+#: contrib/admin/views/main.py:524
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)s \"%(obj)s\" ble slettet."
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "two"
-msgstr "to"
+#: contrib/admin/views/main.py:527
+msgid "Are you sure?"
+msgstr "Er du sikker?"
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "three"
-msgstr "tre"
+#: contrib/admin/views/main.py:549
+#, python-format
+msgid "Change history: %s"
+msgstr "Endringshistorikk: %s"
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "four"
-msgstr "fire"
+#: contrib/admin/views/main.py:583
+#, python-format
+msgid "Select %s"
+msgstr "Velg %s"
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "five"
-msgstr "fem"
+#: contrib/admin/views/main.py:583
+#, python-format
+msgid "Select %s to change"
+msgstr "Velg %s du ønsker å endre"
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "six"
-msgstr "seks"
+#: contrib/admin/views/main.py:765
+msgid "Database error"
+msgstr "Databasefeil"
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "seven"
-msgstr "sju"
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
+msgid "The two password fields didn't match."
+msgstr "De to passordfeltene er ikke like."
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "eight"
-msgstr "åtte"
+#: contrib/auth/forms.py:25
+msgid "A user with that username already exists."
+msgstr "Det eksisterer allerede en bruker med dette brukernavnet."
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "nine"
-msgstr "ni"
+#: contrib/auth/forms.py:53
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Din nettleser ser ikke ut til å støtte informasjonskapsler (cookies). "
+"Informasjonskapsler er påkrevd for å logge inn."
-#: contrib/humanize/templatetags/humanize.py:90
-msgid "today"
-msgstr "i dag"
+#: contrib/auth/forms.py:62
+msgid "This account is inactive."
+msgstr "Denne kontoen er inaktiv."
-#: contrib/humanize/templatetags/humanize.py:92
-msgid "tomorrow"
-msgstr "i morgen"
+#: contrib/auth/forms.py:84
+msgid ""
+"That e-mail address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+"Den oppgitte e-postadressen er ikke registrert hos oss. Er du sikker på at "
+"du har en konto her?"
-#: contrib/humanize/templatetags/humanize.py:94
-msgid "yesterday"
-msgstr "i går"
+#: contrib/auth/forms.py:107
+#, python-format
+msgid "Password reset on %s"
+msgstr "Tilbakestilling av passord på %s"
-#: contrib/auth/views.py:47
-msgid "Logged out"
-msgstr "Logget ut"
+#: contrib/auth/forms.py:117
+msgid "The two 'new password' fields didn't match."
+msgstr "De to feltene for nytt passord er ikke like."
+
+#: contrib/auth/forms.py:124
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Ditt gamle passord er feil. Vennligst prøv igjen."
-#: contrib/auth/models.py:53 contrib/auth/models.py:73
+#: contrib/auth/models.py:73 contrib/auth/models.py:93
msgid "name"
msgstr "navn"
-#: contrib/auth/models.py:55
+#: contrib/auth/models.py:75
msgid "codename"
msgstr "kodenavn"
-#: contrib/auth/models.py:58
+#: contrib/auth/models.py:78
msgid "permission"
msgstr "rettighet"
-#: contrib/auth/models.py:59 contrib/auth/models.py:74
+#: contrib/auth/models.py:79 contrib/auth/models.py:94
msgid "permissions"
msgstr "rettigheter"
-#: contrib/auth/models.py:77
+#: contrib/auth/models.py:97
msgid "group"
msgstr "gruppe"
-#: contrib/auth/models.py:78 contrib/auth/models.py:121
+#: contrib/auth/models.py:98 contrib/auth/models.py:148
msgid "groups"
msgstr "grupper"
-#: contrib/auth/models.py:111
+#: contrib/auth/models.py:138
msgid "username"
msgstr "brukernavn"
-#: contrib/auth/models.py:111
+#: contrib/auth/models.py:138
msgid ""
"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
"digits and underscores)."
-msgstr "Påkrevd. 30 tegn eller færre. Kun alfanumeriske tegn (bokstaver, "
-"tall og understreker)."
+msgstr ""
+"Påkrevd. 30 tegn eller færre. Kun alfanumeriske tegn (bokstaver, tall og "
+"understreker)."
-#: contrib/auth/models.py:112
+#: contrib/auth/models.py:139
msgid "first name"
msgstr "fornavn"
-#: contrib/auth/models.py:113
+#: contrib/auth/models.py:140
msgid "last name"
msgstr "etternavn"
-#: contrib/auth/models.py:114
+#: contrib/auth/models.py:141
msgid "e-mail address"
msgstr "e-postadresse"
-#: contrib/auth/models.py:115
+#: contrib/auth/models.py:142
msgid "password"
msgstr "passord"
-#: contrib/auth/models.py:115
+#: contrib/auth/models.py:142
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the change "
"password form."
-msgstr "Bruk '[algo]$[salt]$[hexdigest]' eller endre "
-"passord-skjemaet."
+msgstr ""
+"Bruk '[algo]$[salt]$[hexdigest]' eller endre passord-"
+"skjemaet."
-#: contrib/auth/models.py:116
+#: contrib/auth/models.py:143
msgid "staff status"
msgstr "administrasjonsstatus"
-#: contrib/auth/models.py:116
+#: contrib/auth/models.py:143
msgid "Designates whether the user can log into this admin site."
-msgstr "Bestemmer om brukeren kan logge inn på disse administrasjonssidene."
+msgstr "Angir at brukeren kan logge inn på disse administrasjonssidene."
-#: contrib/auth/models.py:117
+#: contrib/auth/models.py:144
msgid "active"
msgstr "aktiv"
-#: contrib/auth/models.py:117
+#: contrib/auth/models.py:144
msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
+"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
-msgstr "Bestemmer om brukeren kan logge inn på disse sidene. Huk av denne "
-"i stedet for å slette kontoen."
+msgstr ""
+"Angir at denne brukeren er aktiv. Huk av denne i stedet for å slette kontoen."
-#: contrib/auth/models.py:118
+#: contrib/auth/models.py:145
msgid "superuser status"
msgstr "superbruker"
-#: contrib/auth/models.py:118
+#: contrib/auth/models.py:145
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
-msgstr "Bestemmer om denne brukeren har alle rettigheter, uten å sette de "
-"eksplisitt."
+msgstr ""
+"Angir at denne brukeren har alle rettigheter, uten å sette de eksplisitt."
-#: contrib/auth/models.py:119
+#: contrib/auth/models.py:146
msgid "last login"
msgstr "siste innlogging"
-#: contrib/auth/models.py:120
+#: contrib/auth/models.py:147
msgid "date joined"
-msgstr "registreringsdato"
+msgstr "registrert"
-#: contrib/auth/models.py:122
+#: contrib/auth/models.py:149
msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
msgstr ""
-"I tillegg til rettighetene som blir gitt manuelt, får brukeren også full "
-"tilgang til rettighetene til gruppene han/hun er i."
+"I tillegg til de rettighetene som blir angitt manuelt, får brukeren også "
+"rettighetene gitt til gruppene han/hun er med i."
-#: contrib/auth/models.py:123
+#: contrib/auth/models.py:150
msgid "user permissions"
msgstr "Brukerrettigheter"
-#: contrib/auth/models.py:127
+#: contrib/auth/models.py:154
msgid "user"
msgstr "bruker"
-#: contrib/auth/models.py:128
+#: contrib/auth/models.py:155
msgid "users"
msgstr "brukere"
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:160
msgid "Personal info"
msgstr "Personlig informasjon"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:161
msgid "Permissions"
msgstr "Rettigheter"
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:162
msgid "Important dates"
msgstr "Viktige datoer"
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:163
msgid "Groups"
msgstr "Grupper"
-#: contrib/auth/models.py:288
+#: contrib/auth/models.py:323
msgid "message"
-msgstr "melding"
-
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
-msgid "The two password fields didn't match."
-msgstr "De to passordfeltene er ikke like."
-
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "Det eksisterer en bruker med dette brukernavnet."
-
-#: contrib/auth/forms.py:53
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-"Din nettleser ser ikke ut til å støtte informasjonskapsler (cookies). "
-"Informasjonskapsler er påkrevd for å logge inn."
-
-#: contrib/auth/forms.py:60 contrib/admin/views/decorators.py:10
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på "
-"små og store bokstaver."
-
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
-msgstr "Denne kontoen er inaktiv."
-
-#: contrib/auth/forms.py:84
-msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
-"you've registered?"
-msgstr "Den oppgitte e-postadressen er ikke registrert hos oss. Er du sikker"
-"på at du har en konto her?"
-
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr "De to feltene for nytt passord er ikke like."
-
-#: contrib/auth/forms.py:124
-msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "Ditt gamle passord er feil. Vennligst prøv igjen."
-
-#: contrib/redirects/models.py:7
-msgid "redirect from"
-msgstr "omadresser fra"
-
-#: contrib/redirects/models.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Dette burde vært en fullstendig sti, uten domenenavnet. Eksempel: '/"
-"nyheter/les/"
-
-#: contrib/redirects/models.py:9
-msgid "redirect to"
-msgstr "omadresser til"
-
-#: contrib/redirects/models.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Dette kan enten være en fullstendig sti (som over), eller en hel "
-"internettadresse som starter med 'http://'"
-
-#: contrib/redirects/models.py:13
-msgid "redirect"
-msgstr "omadressering"
-
-#: contrib/redirects/models.py:14
-msgid "redirects"
-msgstr "omadresserelser"
+msgstr "melding"
+
+#: contrib/auth/views.py:49
+msgid "Logged out"
+msgstr "Logget ut"
-#: contrib/comments/models.py:67 contrib/comments/models.py:169
+#: contrib/comments/models.py:71 contrib/comments/models.py:176
msgid "object ID"
msgstr "objekt-ID"
-#: contrib/comments/models.py:68
+#: contrib/comments/models.py:72
msgid "headline"
msgstr "overskrift"
-#: contrib/comments/models.py:69 contrib/comments/models.py:90
-#: contrib/comments/models.py:170
+#: contrib/comments/models.py:73 contrib/comments/models.py:95
+#: contrib/comments/models.py:177
msgid "comment"
msgstr "kommentar"
-#: contrib/comments/models.py:70
+#: contrib/comments/models.py:74
msgid "rating #1"
msgstr "rangering #1 "
-#: contrib/comments/models.py:71
+#: contrib/comments/models.py:75
msgid "rating #2"
msgstr "rangering #2"
-#: contrib/comments/models.py:72
+#: contrib/comments/models.py:76
msgid "rating #3"
msgstr "rangering #3"
-#: contrib/comments/models.py:73
+#: contrib/comments/models.py:77
msgid "rating #4"
msgstr "rangering #4"
-#: contrib/comments/models.py:74
+#: contrib/comments/models.py:78
msgid "rating #5"
msgstr "rangering #5"
-#: contrib/comments/models.py:75
+#: contrib/comments/models.py:79
msgid "rating #6"
msgstr "rangering #6"
-#: contrib/comments/models.py:76
+#: contrib/comments/models.py:80
msgid "rating #7"
msgstr "rangering #7"
-#: contrib/comments/models.py:77
+#: contrib/comments/models.py:81
msgid "rating #8"
msgstr "rangering #8"
-#: contrib/comments/models.py:82
+#: contrib/comments/models.py:86
msgid "is valid rating"
msgstr "er gyldig rangering"
-#: contrib/comments/models.py:83 contrib/comments/models.py:172
+#: contrib/comments/models.py:87 contrib/comments/models.py:179
msgid "date/time submitted"
msgstr "dato/tid for innsendelse"
-#: contrib/comments/models.py:84 contrib/comments/models.py:173
+#: contrib/comments/models.py:88 contrib/comments/models.py:180
msgid "is public"
msgstr "er tilgjengelig for alle"
-#: contrib/comments/models.py:85 contrib/admin/views/doc.py:306
-msgid "IP address"
-msgstr "IP-adresse"
-
-#: contrib/comments/models.py:86
+#: contrib/comments/models.py:90
msgid "is removed"
msgstr "er fjernet"
-#: contrib/comments/models.py:86
+#: contrib/comments/models.py:90
msgid ""
"Check this box if the comment is inappropriate. A \"This comment has been "
"removed\" message will be displayed instead."
msgstr ""
"Huk av denne avkryssningsboksen hvis kommentaren er upasende. Beskjeden "
-"\"Denne kommentaren er blitt fjernet\" vil bli vist istedet."
+"\"Denne kommentaren har blitt fjernet\" vil bli vist i stedet."
-#: contrib/comments/models.py:91
+#: contrib/comments/models.py:96
msgid "comments"
msgstr "kommentarer"
-#: contrib/comments/models.py:134 contrib/comments/models.py:213
+#: contrib/comments/models.py:140 contrib/comments/models.py:222
msgid "Content object"
msgstr "innholdsobjekt"
-#: contrib/comments/models.py:162
+#: contrib/comments/models.py:168
#, python-format
msgid ""
"Posted by %(user)s at %(date)s\n"
@@ -1264,54 +1342,54 @@ msgid ""
"\n"
"http://%(domain)s%(url)s"
msgstr ""
-"Sendt av %(user)s på %(date)s\n"
+"Skrevet av %(user)s, %(date)s\n"
"\n"
"%(comment)s\n"
"\n"
"http://%(domain)s%(url)s"
-#: contrib/comments/models.py:171
+#: contrib/comments/models.py:178
msgid "person's name"
msgstr "personens navn"
-#: contrib/comments/models.py:174
+#: contrib/comments/models.py:181
msgid "ip address"
msgstr "IP-adresse"
-#: contrib/comments/models.py:176
+#: contrib/comments/models.py:183
msgid "approved by staff"
msgstr "godkjent av moderator"
-#: contrib/comments/models.py:179
+#: contrib/comments/models.py:187
msgid "free comment"
msgstr "åpen kommentar"
-#: contrib/comments/models.py:180
+#: contrib/comments/models.py:188
msgid "free comments"
msgstr "åpne kommentarer"
-#: contrib/comments/models.py:239
+#: contrib/comments/models.py:250
msgid "score"
msgstr "poeng"
-#: contrib/comments/models.py:240
+#: contrib/comments/models.py:251
msgid "score date"
msgstr "poengdato"
-#: contrib/comments/models.py:243
+#: contrib/comments/models.py:255
msgid "karma score"
msgstr "karmapoeng"
-#: contrib/comments/models.py:244
+#: contrib/comments/models.py:256
msgid "karma scores"
msgstr "karmapoeng"
-#: contrib/comments/models.py:248
+#: contrib/comments/models.py:260
#, python-format
msgid "%(score)d rating by %(user)s"
msgstr "%(score)d rangering av %(user)s"
-#: contrib/comments/models.py:264
+#: contrib/comments/models.py:277
#, python-format
msgid ""
"This comment was flagged by %(user)s:\n"
@@ -1322,58 +1400,82 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/models.py:271
+#: contrib/comments/models.py:285
msgid "flag date"
msgstr "flaggdato"
-#: contrib/comments/models.py:274
+#: contrib/comments/models.py:289
msgid "user flag"
msgstr "brukerflag"
-#: contrib/comments/models.py:275
+#: contrib/comments/models.py:290
msgid "user flags"
msgstr "brukerflag"
-#: contrib/comments/models.py:279
+#: contrib/comments/models.py:294
#, python-format
msgid "Flag by %r"
msgstr "Flagg med %r"
-#: contrib/comments/models.py:284
+#: contrib/comments/models.py:300
msgid "deletion date"
msgstr "dato fjernet"
-#: contrib/comments/models.py:286
+#: contrib/comments/models.py:303
msgid "moderator deletion"
msgstr "fjernet av moderator"
-#: contrib/comments/models.py:287
+#: contrib/comments/models.py:304
msgid "moderator deletions"
msgstr "fjernet av moderator"
-#: contrib/comments/models.py:291
+#: contrib/comments/models.py:308
#, python-format
msgid "Moderator deletion by %r"
-msgstr "Fjernet av moderator med %r"
+msgstr "Fjernet av moderator %r"
-#: contrib/comments/views/karma.py:20
-msgid "Anonymous users cannot vote"
-msgstr "Anonyme brukere kan ikke stemme"
+#: contrib/comments/templates/comments/form.html:8
+msgid "Forgotten your password?"
+msgstr "Har du glemt passordet ditt?"
-#: contrib/comments/views/karma.py:24
-msgid "Invalid comment ID"
-msgstr "Ikke gyldig kommentar-ID"
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr "Rangeringer"
-#: contrib/comments/views/karma.py:26
-msgid "No voting for yourself"
-msgstr "Du kan ikke stemme på deg selv"
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr "Påkrevd"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr "Valgfri"
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr "Send et bilde"
+
+#: contrib/comments/templates/comments/form.html:28
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: contrib/comments/templates/comments/form.html:35
+#: contrib/comments/templates/comments/freeform.html:10
+msgid "Preview comment"
+msgstr "Forhåndvis kommentar"
+
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr "Ditt navn:"
#: contrib/comments/views/comments.py:28
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
"Denne rangeringen er påkrevd, fordi du har rangert en eller flere ting fra "
-"før "
+"før."
#: contrib/comments/views/comments.py:112
#, python-format
@@ -1388,13 +1490,13 @@ msgid_plural ""
"\n"
"%(text)s"
msgstr[0] ""
-"Denne kommentaren var skrevet av en bruker som har fra før skrevet under %"
-"(count)s kommentarer:\n"
+"Denne kommentaren var skrevet av en bruker som har skrevet mindre enn "
+"%(count)s kommentarer:\n"
"\n"
"%(text)s"
msgstr[1] ""
-"Denne kommentaren var skrevet av en bruker som har fra før skrevet under %"
-"(count)s kommentarer:\n"
+"Denne kommentaren var skrevet av en bruker som har skrevet mindre enn "
+"%(count)s kommentarer:\n"
"\n"
"%(text)s"
@@ -1409,1178 +1511,1084 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:189
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:283
msgid "Only POSTs are allowed"
msgstr "Kun POST er tillatt"
-#: contrib/comments/views/comments.py:193
-#: contrib/comments/views/comments.py:285
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:287
msgid "One or more of the required fields wasn't submitted"
msgstr "En eller flere av feltene som er påkrevd ble ikke sendt."
-#: contrib/comments/views/comments.py:197
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:198
+#: contrib/comments/views/comments.py:289
msgid "Somebody tampered with the comment form (security violation)"
msgstr "Noen har endret på komentarfeltene (sikkerhetsadvarsel)"
-#: contrib/comments/views/comments.py:207
-#: contrib/comments/views/comments.py:293
+#: contrib/comments/views/comments.py:208
+#: contrib/comments/views/comments.py:295
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr "Skjemaet hadde en ugyldig 'target'-verdi - objekt-IDen var ugyldig"
-#: contrib/comments/views/comments.py:258
-#: contrib/comments/views/comments.py:322
+#: contrib/comments/views/comments.py:259
+#: contrib/comments/views/comments.py:324
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr "Kommentarskjemaet la ikke ved 'preview'- eller 'post'-element"
-#: contrib/comments/templates/comments/freeform.html:4
-msgid "Your name:"
-msgstr "Ditt navn:"
-
-#: contrib/comments/templates/comments/freeform.html:5
-#: contrib/comments/templates/comments/form.html:28
-msgid "Comment:"
-msgstr "Kommentar:"
-
-#: contrib/comments/templates/comments/freeform.html:10
-#: contrib/comments/templates/comments/form.html:35
-msgid "Preview comment"
-msgstr "Forhåndvis kommentar"
-
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/login.html:17
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Log out"
-msgstr "Logg ut"
-
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/login.html:20
-msgid "Password:"
-msgstr "Passord:"
-
-#: contrib/comments/templates/comments/form.html:8
-msgid "Forgotten your password?"
-msgstr "Har du glemt passordet ditt?"
+#: contrib/comments/views/karma.py:21
+msgid "Anonymous users cannot vote"
+msgstr "Anonyme brukere kan ikke stemme"
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
-msgstr "Rangeringer"
+#: contrib/comments/views/karma.py:25
+msgid "Invalid comment ID"
+msgstr "Ugyldig kommentar-ID"
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-msgstr "Påkrevd"
+#: contrib/comments/views/karma.py:27
+msgid "No voting for yourself"
+msgstr "Du kan ikke stemme på deg selv"
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-msgstr "Valgfri"
+#: contrib/contenttypes/models.py:67
+msgid "python model class name"
+msgstr "python-modell klassenavn"
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-msgstr "Send et bilde"
+#: contrib/contenttypes/models.py:71
+msgid "content type"
+msgstr "innholdstype"
-#: contrib/flatpages/models.py:7 contrib/admin/views/doc.py:317
-msgid "URL"
-msgstr "URL"
+#: contrib/contenttypes/models.py:72
+msgid "content types"
+msgstr "innholdstyper"
-#: contrib/flatpages/models.py:8
+#: contrib/flatpages/models.py:9
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Eksempel: '/om/kontakt/'. Vær sikker på at det er en skråstrek foran og bak."
-#: contrib/flatpages/models.py:9
+#: contrib/flatpages/models.py:10
msgid "title"
msgstr "tittel"
-#: contrib/flatpages/models.py:10
+#: contrib/flatpages/models.py:11
msgid "content"
msgstr "innhold"
-#: contrib/flatpages/models.py:11
+#: contrib/flatpages/models.py:12
msgid "enable comments"
msgstr "tillat kommentarer"
-#: contrib/flatpages/models.py:12
+#: contrib/flatpages/models.py:13
msgid "template name"
-msgstr "navn på mal"
+msgstr "malnavn"
-#: contrib/flatpages/models.py:13
+#: contrib/flatpages/models.py:14
msgid ""
"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
"will use 'flatpages/default.html'."
msgstr ""
-"Eksempel: 'flatpages/kontakt_side.html'. Hvis denne ikke denne er gitt, vil "
+"Eksempel: 'flatpages/kontakt_side.html'. Hvis denne ikke er gitt, vil "
"'flatpages/default.html' bli brukt."
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
msgid "registration required"
msgstr "registrering kreves"
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"Hvis denne er krysset av, er det kun innloggede brukere som kan se siden."
-#: contrib/flatpages/models.py:18
+#: contrib/flatpages/models.py:20
msgid "flat page"
msgstr "flatside"
-#: contrib/flatpages/models.py:19
+#: contrib/flatpages/models.py:21
msgid "flat pages"
msgstr "flatsider"
-#: contrib/sessions/models.py:68
-msgid "session key"
-msgstr "sesjonsnøkkel"
-
-#: contrib/sessions/models.py:69
-msgid "session data"
-msgstr "sesjonsdata"
-
-#: contrib/sessions/models.py:70
-msgid "expire date"
-msgstr "utløpsdato"
-
-#: contrib/sessions/models.py:74
-msgid "session"
-msgstr "sesjon"
-
-#: contrib/sessions/models.py:75
-msgid "sessions"
-msgstr "sesjoner"
-
-#: contrib/sites/models.py:15
-msgid "domain name"
-msgstr "domenenavn"
-
-#: contrib/sites/models.py:16
-msgid "display name"
-msgstr "visningsnavn"
+#: contrib/flatpages/models.py:27
+msgid "Advanced options"
+msgstr "Avanserte innstillinger"
-#: contrib/sites/models.py:20
-msgid "site"
-msgstr "nettsted"
+#: contrib/humanize/templatetags/humanize.py:19
+msgid "th"
+msgstr ""
-#: contrib/sites/models.py:21
-msgid "sites"
-msgstr "nettsteder"
+#: contrib/humanize/templatetags/humanize.py:19
+msgid "st"
+msgstr ""
-#: contrib/admin/filterspecs.py:42
-#, python-format
-msgid ""
-"
\n"
-#: contrib/admin/filterspecs.py:72 contrib/admin/filterspecs.py:90
-#: contrib/admin/filterspecs.py:145 contrib/admin/filterspecs.py:171
-msgid "All"
-msgstr "Alle"
+#: contrib/humanize/templatetags/humanize.py:19
+msgid "rd"
+msgstr ""
-#: contrib/admin/filterspecs.py:111
-msgid "Any date"
-msgstr "Når som helst"
+#: contrib/humanize/templatetags/humanize.py:51
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f million"
+msgstr[1] "%(value).1f millioner"
-#: contrib/admin/filterspecs.py:112
-msgid "Today"
-msgstr "I dag"
+#: contrib/humanize/templatetags/humanize.py:54
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f milliard"
+msgstr[1] "%(value).1f milliarder"
-#: contrib/admin/filterspecs.py:115
-msgid "Past 7 days"
-msgstr "Siste 7 dager"
+#: contrib/humanize/templatetags/humanize.py:57
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f billion"
+msgstr[1] "%(value).1f billioner"
-#: contrib/admin/filterspecs.py:117
-msgid "This month"
-msgstr "Denne måneden"
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "one"
+msgstr "én"
-#: contrib/admin/filterspecs.py:119
-msgid "This year"
-msgstr "I år"
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "two"
+msgstr "to"
-#: contrib/admin/filterspecs.py:145 oldforms/__init__.py:591
-#: newforms/widgets.py:188
-msgid "Yes"
-msgstr "Ja"
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "three"
+msgstr "tre"
-#: contrib/admin/filterspecs.py:145 oldforms/__init__.py:591
-#: newforms/widgets.py:188
-msgid "No"
-msgstr "Nei"
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "four"
+msgstr "fire"
-#: contrib/admin/filterspecs.py:152 oldforms/__init__.py:591
-#: newforms/widgets.py:188
-msgid "Unknown"
-msgstr "Ukjent"
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "five"
+msgstr "fem"
-#: contrib/admin/models.py:17
-msgid "action time"
-msgstr "tid for handling"
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "six"
+msgstr "seks"
-#: contrib/admin/models.py:20
-msgid "object id"
-msgstr "objekt-ID"
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "seven"
+msgstr "sju"
-#: contrib/admin/models.py:21
-msgid "object repr"
-msgstr "objekt repr"
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "eight"
+msgstr "åtte"
-#: contrib/admin/models.py:22
-msgid "action flag"
-msgstr "handlingsflagg"
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "nine"
+msgstr "ni"
-#: contrib/admin/models.py:23
-msgid "change message"
-msgstr "endre melding"
+#: contrib/humanize/templatetags/humanize.py:93
+msgid "today"
+msgstr "i dag"
-#: contrib/admin/models.py:26
-msgid "log entry"
-msgstr "logginnlegg"
+#: contrib/humanize/templatetags/humanize.py:95
+msgid "tomorrow"
+msgstr "i morgen"
-#: contrib/admin/models.py:27
-msgid "log entries"
-msgstr "logginnlegg"
+#: contrib/humanize/templatetags/humanize.py:97
+msgid "yesterday"
+msgstr "i går"
-#: contrib/admin/templatetags/admin_list.py:254
-msgid "All dates"
-msgstr "Alle datoer"
+#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12
+msgid "Enter a zip code in the format XXXX."
+msgstr "Skriv inn et postnummer som XXXX."
-#: contrib/admin/views/decorators.py:24
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "Logg inn"
+#: contrib/localflavor/no/forms.py:33
+msgid "Enter a valid Norwegian social security number."
+msgstr "Skriv et gyldig norsk personnummer."
-#: contrib/admin/views/decorators.py:62
+#: contrib/redirects/models.py:7
+msgid "redirect from"
+msgstr "omadresser fra"
+
+#: contrib/redirects/models.py:8
msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
msgstr ""
-"Du må logge inn igjen, fordi økten din har gått ut. Slapp av, innlegget ditt "
-"ble lagret."
+"Dette burde vært en fullstendig sti, uten domenenavnet. Eksempel: '/nyheter/"
+"les/"
-#: contrib/admin/views/decorators.py:69
+#: contrib/redirects/models.py:9
+msgid "redirect to"
+msgstr "omadresser til"
+
+#: contrib/redirects/models.py:10
msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
msgstr ""
-"Det ser ut som om nettleseren din ikke støtter informasjonskapsler "
-"('cookies'). Vennligst konfigurer nettleseren din, og prøv igjen."
+"Dette kan enten være en fullstendig sti (som over), eller en fullstendig "
+"nettadresse som starter med 'http://'"
-#: contrib/admin/views/decorators.py:83
-msgid "Usernames cannot contain the '@' character."
-msgstr "Brukernavnet kan ikke inneholde '@'"
+#: contrib/redirects/models.py:13
+msgid "redirect"
+msgstr "omadressering"
-#: contrib/admin/views/decorators.py:85
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "E-postadressen din er ikke brukernavnet ditt, prøv '%s' i stede."
+#: contrib/redirects/models.py:14
+msgid "redirects"
+msgstr "omadresserelser"
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:264
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" ble lagt inn i databasen."
+#: contrib/sessions/models.py:45
+msgid "session key"
+msgstr "sesjonsnøkkel"
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:268
-#: contrib/admin/views/main.py:354
-msgid "You may edit it again below."
-msgstr "Du kan endre under"
+#: contrib/sessions/models.py:47
+msgid "session data"
+msgstr "sesjonsdata"
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr "Ny bruker"
+#: contrib/sessions/models.py:48
+msgid "expire date"
+msgstr "utløpsdato"
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
-msgstr "Passordet er endret."
+#: contrib/sessions/models.py:53
+msgid "session"
+msgstr "sesjon"
-#: contrib/admin/views/auth.py:65
-#, python-format
-msgid "Change password: %s"
-msgstr "Endre passord: %s"
+#: contrib/sessions/models.py:54
+msgid "sessions"
+msgstr "sesjoner"
-#: contrib/admin/views/main.py:230
-msgid "Site administration"
-msgstr "Nettstedsadministrasjon"
+#: contrib/sites/models.py:32
+msgid "domain name"
+msgstr "domenenavn"
-#: contrib/admin/views/main.py:278 contrib/admin/views/main.py:363
-#, python-format
-msgid "You may add another %s below."
-msgstr "Du kan legge til en ny %s under."
+#: contrib/sites/models.py:33
+msgid "display name"
+msgstr "visningsnavn"
-#: contrib/admin/views/main.py:296
-#, python-format
-msgid "Add %s"
-msgstr "Ny %s"
+#: contrib/sites/models.py:37
+msgid "site"
+msgstr "nettsted"
-#: contrib/admin/views/main.py:342
-#, python-format
-msgid "Added %s."
-msgstr "La til %s"
+#: contrib/sites/models.py:38
+msgid "sites"
+msgstr "nettsteder"
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Changed %s."
-msgstr "Endret %s."
+#: core/validators.py:72
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Dette feltet kan bare inneholde bokstaver, nummer og understreker."
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Deleted %s."
-msgstr "Slettet %s."
+#: core/validators.py:76
+msgid ""
+"This value must contain only letters, numbers, underscores, dashes or "
+"slashes."
+msgstr ""
+"Dette feltet kan bare inneholde bokstaver, nummer, understreker, "
+"bindestreker eller skråstreker."
-#: contrib/admin/views/main.py:349
-msgid "No fields changed."
-msgstr "Ingen felt endret."
+#: core/validators.py:80
+msgid "This value must contain only letters, numbers, underscores or hyphens."
+msgstr ""
+"Dette feltet kan bare inneholde bokstaver, nummer, understreker eller "
+"bindestreker."
-#: contrib/admin/views/main.py:352
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ble endret."
+#: core/validators.py:84
+msgid "Uppercase letters are not allowed here."
+msgstr "Store bokstaver er ikke tillatt her."
-#: contrib/admin/views/main.py:360
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under."
+#: core/validators.py:88
+msgid "Lowercase letters are not allowed here."
+msgstr "Små bokstaver er ikke tillatt her."
-#: contrib/admin/views/main.py:398
-#, python-format
-msgid "Change %s"
-msgstr "Endre %s"
+#: core/validators.py:95
+msgid "Enter only digits separated by commas."
+msgstr "Skriv inn kun tall adskilt med komma."
-#: contrib/admin/views/main.py:483
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "En eller flere %(fieldname)s i %(name)s: %(obj)s"
+#: core/validators.py:107
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Skriv inn gyldige e-postadresser, adskilt med komma."
-#: contrib/admin/views/main.py:488
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "En eller flere %(fieldname)s i %(name)s:"
+#: core/validators.py:111
+msgid "Please enter a valid IP address."
+msgstr "Vennligst skriv inn en gyldig IP-adresse."
-#: contrib/admin/views/main.py:520
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" ble slettet."
+#: core/validators.py:115
+msgid "Empty values are not allowed here."
+msgstr "Dette feltet kan ikke være tomt."
-#: contrib/admin/views/main.py:523
-msgid "Are you sure?"
-msgstr "Er du sikker?"
+#: core/validators.py:119
+msgid "Non-numeric characters aren't allowed here."
+msgstr "Dette feltet kan kun bestå av tall."
-#: contrib/admin/views/main.py:545
-#, python-format
-msgid "Change history: %s"
-msgstr "Endringshistorikk: %s"
+#: core/validators.py:123
+msgid "This value can't be comprised solely of digits."
+msgstr "Dette feltet kan ikke bare bestå av siffer."
-#: contrib/admin/views/main.py:579
-#, python-format
-msgid "Select %s"
-msgstr "Velg %s"
+#: core/validators.py:128 newforms/fields.py:157
+msgid "Enter a whole number."
+msgstr "Skriv inn et helt nummer."
+
+#: core/validators.py:132
+msgid "Only alphabetical characters are allowed here."
+msgstr "Bare alfabetiske tegn er tillatt her."
-#: contrib/admin/views/main.py:579
+#: core/validators.py:147
+msgid "Year must be 1900 or later."
+msgstr "År må være 1900 eller senere."
+
+#: core/validators.py:151
#, python-format
-msgid "Select %s to change"
-msgstr "Velg %s for å endre"
+msgid "Invalid date: %s"
+msgstr "Ugyldig dato: %s"
-#: contrib/admin/views/main.py:780
-msgid "Database error"
-msgstr "Databasefeil"
+#: core/validators.py:156 db/models/fields/__init__.py:554
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Skriv inn en gyldig dato som ÅÅÅÅ-MM-DD."
-#: contrib/admin/views/doc.py:47 contrib/admin/views/doc.py:49
-#: contrib/admin/views/doc.py:51
-msgid "tag:"
-msgstr ""
+#: core/validators.py:161
+msgid "Enter a valid time in HH:MM format."
+msgstr "Skriv inn tiden som TT:MM."
-#: contrib/admin/views/doc.py:78 contrib/admin/views/doc.py:80
-#: contrib/admin/views/doc.py:82
-msgid "filter:"
-msgstr ""
+#: core/validators.py:165 db/models/fields/__init__.py:631
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "Skriv inn dato og tid som ÅÅÅÅ-MM-DD TT:MM."
-#: contrib/admin/views/doc.py:136 contrib/admin/views/doc.py:138
-#: contrib/admin/views/doc.py:140
-msgid "view:"
+#: core/validators.py:170 newforms/fields.py:408
+msgid "Enter a valid e-mail address."
+msgstr "Skriv inn en gyldig e-postadresse."
+
+#: core/validators.py:182 core/validators.py:474 newforms/fields.py:426
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "Ingen fil ble sendt. Sjekk \"encoding\"-typen på skjemaet."
+
+#: core/validators.py:193 newforms/fields.py:468
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
msgstr ""
+"Last opp et gyldig bilde. Filen du lastet opp var ikke et bilde eller "
+"var ødelagt."
-#: contrib/admin/views/doc.py:165
+#: core/validators.py:200
#, python-format
-msgid "App %r not found"
-msgstr "Fan ikke applikasjonen %r"
+msgid "The URL %s does not point to a valid image."
+msgstr "Nettadressen %s peker ikke på et gyldig bilde."
-#: contrib/admin/views/doc.py:172
+#: core/validators.py:204
#, python-format
-msgid "Model %(name)r not found in app %(label)r"
-msgstr "Fant ikke %(name)r-modellen i applikasjonen %(label)r"
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr "Telefonnummeret må være i XXX-XXX-XXXX format. \"%s\" er ugyldig."
-#: contrib/admin/views/doc.py:184
+#: core/validators.py:212
#, python-format
-msgid "the related `%(label)s.%(type)s` object"
-msgstr "det relaterte `%(label)s.%(type)s`-objektet"
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "Nettadressen %s peker ikke på en gyldig QuickTime-video."
-#: contrib/admin/views/doc.py:184 contrib/admin/views/doc.py:206
-#: contrib/admin/views/doc.py:220 contrib/admin/views/doc.py:225
-msgid "model:"
-msgstr ""
+#: core/validators.py:216
+msgid "A valid URL is required."
+msgstr "En gyldig nettadresse er påkrevd."
-#: contrib/admin/views/doc.py:215
+#: core/validators.py:230
#, python-format
-msgid "related `%(label)s.%(name)s` objects"
-msgstr "relaterte `%(label)s.%(name)s`-objekter"
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"Gyldig HTML er påkrevd. Feilene var:\n"
+"%s"
-#: contrib/admin/views/doc.py:220
+#: core/validators.py:237
#, python-format
-msgid "all %s"
-msgstr "alle %s"
+msgid "Badly formed XML: %s"
+msgstr "Ikke velformet XML: %s"
-#: contrib/admin/views/doc.py:225
+#: core/validators.py:254
#, python-format
-msgid "number of %s"
-msgstr "antall %s"
+msgid "Invalid URL: %s"
+msgstr "Ugyldig nettadresse: %s"
-#: contrib/admin/views/doc.py:230
+#: core/validators.py:259 core/validators.py:261
#, python-format
-msgid "Fields on %s objects"
-msgstr "Felter på %s objekter"
-
-#: contrib/admin/views/doc.py:292 contrib/admin/views/doc.py:303
-#: contrib/admin/views/doc.py:305 contrib/admin/views/doc.py:311
-#: contrib/admin/views/doc.py:312 contrib/admin/views/doc.py:314
-msgid "Integer"
-msgstr "Heltall"
+msgid "The URL %s is a broken link."
+msgstr "Nettadressen %s fører til en side som ikke eksisterer."
-#: contrib/admin/views/doc.py:293
-msgid "Boolean (Either True or False)"
-msgstr "Boolean (enten \"True\" eller \"False\")"
+#: core/validators.py:267
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Skriv inn en gyldig amerikansk delstatsforkortelse."
-#: contrib/admin/views/doc.py:294 contrib/admin/views/doc.py:313
+#: core/validators.py:281
#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr "Tekst (opp til %(max_length)s tegn)"
-
-#: contrib/admin/views/doc.py:295
-msgid "Comma-separated integers"
-msgstr "Heltall adskilt med komma"
+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] "Pass munnen din! Ordet %s er ikke tillatt her."
+msgstr[1] "Pass munnen din! Ordene %s er ikke tillatt her."
-#: contrib/admin/views/doc.py:296
-msgid "Date (without time)"
-msgstr "Dato (uten tid)"
+#: core/validators.py:288
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "Dette feltet må være det samme som '%s'-feltet."
-#: contrib/admin/views/doc.py:297
-msgid "Date (with time)"
-msgstr "Dato/tid"
+#: core/validators.py:307
+msgid "Please enter something for at least one field."
+msgstr "Vennligst skriv inn noe i minst ett felt."
-#: contrib/admin/views/doc.py:298
-msgid "Decimal number"
-msgstr "Desimaltall"
+#: core/validators.py:316 core/validators.py:327
+msgid "Please enter both fields or leave them both empty."
+msgstr "Vennligst skriv inn noe i begge feltene, eller la begge være blanke."
-#: contrib/admin/views/doc.py:299
-msgid "E-mail address"
-msgstr "E-postadresse"
+#: core/validators.py:335
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "Dette feltet kreves hvis %(field)s er lik %(value)s"
-#: contrib/admin/views/doc.py:300 contrib/admin/views/doc.py:301
-#: contrib/admin/views/doc.py:304
-msgid "File path"
-msgstr "Filsti"
+#: core/validators.py:348
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "Dette feltet kreves hvis %(field)s ikke er lik %(value)s"
-#: contrib/admin/views/doc.py:302
-msgid "Floating point number"
-msgstr "Flyttall"
+#: core/validators.py:367
+msgid "Duplicate values are not allowed."
+msgstr "Like verdier er ikke tillatt."
-#: contrib/admin/views/doc.py:308
-msgid "Boolean (Either True, False or None)"
-msgstr "Boolean (enten \"True\", \"False\" eller \"None\")"
+#: core/validators.py:382
+#, python-format
+msgid "This value must be between %(lower)s and %(upper)s."
+msgstr "Denne verdien må være mellom %(lower)s og %(upper)s."
-#: contrib/admin/views/doc.py:309
-msgid "Relation to parent model"
-msgstr "Relasjon til foreldermodell"
+#: core/validators.py:384
+#, python-format
+msgid "This value must be at least %s."
+msgstr "Denne verdien må minst være %s."
-#: contrib/admin/views/doc.py:310
-msgid "Phone number"
-msgstr "Telefonnummer"
+#: core/validators.py:386
+#, python-format
+msgid "This value must be no more than %s."
+msgstr "Denne verdien kan ikke være mer enn %s."
-#: contrib/admin/views/doc.py:315
-msgid "Text"
-msgstr "Tekst"
+#: core/validators.py:427
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "Denne verdien må være et kvadrat av %s."
-#: contrib/admin/views/doc.py:316
-msgid "Time"
-msgstr "Tid"
+#: core/validators.py:437
+msgid "Please enter a valid decimal number."
+msgstr "Vennligst skriv inn et gyldig desimaltall."
-#: contrib/admin/views/doc.py:318
-msgid "U.S. state (two uppercase letters)"
-msgstr "Stat (i USA, to store bokstaver)"
+#: core/validators.py:444
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] "Skriv inn et desimaltall med maks %s siffer."
+msgstr[1] "Skriv inn et desimaltall med maks %s siffer."
-#: contrib/admin/views/doc.py:319
-msgid "XML text"
-msgstr "XML-tekst"
+#: core/validators.py:447
+#, python-format
+msgid ""
+"Please enter a valid decimal number with a whole part of at most %s digit."
+msgid_plural ""
+"Please enter a valid decimal number with a whole part of at most %s digits."
+msgstr[0] "Skriv inn et desimaltall hvor heltallsdelen er maks %s siffer."
+msgstr[1] "Skriv inn et desimaltall hvor heltallsdelen er maks %s siffer."
-#: contrib/admin/views/doc.py:345
+#: core/validators.py:450
#, python-format
-msgid "%s does not appear to be a urlpattern object"
-msgstr "%s ser ikke ut til å være et urlpattern-objekt"
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "Skriv inn et desimaltall med maks %s siffer bak komma."
+msgstr[1] "Skriv inn et desimaltall med maks %s siffer bak komma."
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Nå:"
+#: core/validators.py:458
+msgid "Please enter a valid floating point number."
+msgstr "Vennligst skriv inn et gyldig flyttall."
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Endre:"
+#: core/validators.py:467
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "Vær sikker på at filen du prøver å laste opp minst er %s bytes."
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Dato:"
+#: core/validators.py:468
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr ""
+"Vær sikker på at filen du prøver å laste opp ikke er mer enn %s bytes."
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Tid:"
+#: core/validators.py:485
+msgid "The format for this field is wrong."
+msgstr "Formatet i dette feltet er feil."
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Documentation"
-msgstr "Dokumentasjon"
+#: core/validators.py:500
+msgid "This field is invalid."
+msgstr "Dette feltet er ugyldig."
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin/auth/user/change_password.html:15
-#: contrib/admin/templates/admin/auth/user/change_password.html:46
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Change password"
-msgstr "Endre passord"
+#: core/validators.py:536
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "Klarte ikke å hente noe fra %s."
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/admin/base.html:30
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/auth/user/change_password.html:12
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Home"
-msgstr "Hjem"
+#: core/validators.py:539
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+"Nettadressen %(url)s returnerte den ugyldige Content-Type-headeren "
+"'%(contenttype)s'."
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:21
-msgid "History"
-msgstr "Historikk"
+#: core/validators.py:572
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Vennligst lukk taggen %(tag)s på linje %(line)s. (Linjen starer med "
+"\"%(start)s\".)"
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "Dato/tid"
+#: core/validators.py:576
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Noe av teksten som starter på linje %(line)s er ikke tillatt. (Linjen "
+"starter med \"%(start)s\".)"
-#: contrib/admin/templates/admin/object_history.html:19
-msgid "User"
-msgstr "Bruker"
+#: core/validators.py:581
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"%(attr)s\" på linje %(line)s er et ugyldig attributt. (Linjen starter med "
+"\"%(start)s\".)"
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
-msgstr "Handling"
+#: core/validators.py:586
+#, python-format
+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 ugyldig element. (Linjen starter med "
+"\"%(start)s\".)"
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "h:i, j. M Y"
+#: core/validators.py:590
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Et element på linje %(line)s mangler et av de påkrevde attributtene. (Linjen "
+"starter med \"%(start)s\".)"
-#: contrib/admin/templates/admin/object_history.html:36
+#: core/validators.py:595
+#, python-format
msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
msgstr ""
-"Dette objektet har ingen endringshistorikk. Det var sannsynligvis ikke lagt "
-"til via denne siden."
+"\"%(attr)s\"-attributtet på linje %(line)s har en ugyldig verdi. (Linjen "
+"starter med \"%(start)s\".)"
-#: contrib/admin/templates/admin/change_list.html:12
+#: db/models/manipulators.py:308
#, python-format
-msgid "Add %(name)s"
-msgstr "Legg til %(name)s"
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr "%(object)s med %(type)s finnes allerede for angitt %(field)s."
-#: contrib/admin/templates/admin/filter.html:2
+#: db/models/fields/__init__.py:52
#, python-format
-msgid " By %(filter_title)s "
-msgstr "Av %(filter_title)s "
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "%(optname)s med %(fieldname)s finnes allerede."
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Tjenerfeil"
+#: db/models/fields/__init__.py:182 db/models/fields/__init__.py:354
+#: db/models/fields/__init__.py:788 db/models/fields/__init__.py:799
+#: newforms/fields.py:51 oldforms/__init__.py:374
+msgid "This field is required."
+msgstr "Dette feltet er påkrevd."
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Tjenerfeil (500)"
+#: db/models/fields/__init__.py:454
+msgid "This value must be an integer."
+msgstr "Denne verdien må være et heltall."
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error (500)"
-msgstr "Tjenerfeil (500)"
+#: db/models/fields/__init__.py:493
+msgid "This value must be either True or False."
+msgstr "Denne verdien må være \"True\" eller \"False\"."
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Det har oppstått en feil. Feilen er blitt rapportert til administrator via e-"
-"post, og vil bli fikset snart. Takk for din tålmodighet."
+#: db/models/fields/__init__.py:517
+msgid "This field cannot be null."
+msgstr "Dette feltet kan ikke være tomt."
-#: contrib/admin/templates/admin/invalid_setup.html:8
-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 "Noe er galt med databaseinstallasjonen din. Sørg for at "
-"databasetabellene er opprett, og at brukeren har de nødvendige rettigheter."
+#: db/models/fields/__init__.py:695
+msgid "This value must be a decimal number."
+msgstr "Denne verdien må være et desimaltall."
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-msgstr "Gå"
+#: db/models/fields/__init__.py:808
+msgid "Enter a valid filename."
+msgstr "Skriv inn et gyldig filnavn."
-#: contrib/admin/templates/admin/search_form.html:10
+#: db/models/fields/__init__.py:1002
+msgid "This value must be either None, True or False."
+msgstr "Denne verdien må være None, True eller False."
+
+#: db/models/fields/related.py:94
#, python-format
-msgid "1 result"
-msgid_plural "%(counter)s results"
-msgstr[0] "Ett resultat"
-msgstr[1] "(counter)s resultat"
+msgid "Please enter a valid %s."
+msgstr "Vennligst skriv inn en/et gyldig %s."
-#: contrib/admin/templates/admin/search_form.html:10
+#: db/models/fields/related.py:756
+msgid "Separate multiple IDs with commas."
+msgstr "Separer flere ID-er med komma."
+
+#: db/models/fields/related.py:758
+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:805
#, python-format
-msgid "%(full_result_count)s total"
-msgstr "%(full_result_count)s totalt"
+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] "Skriv inn gyldige %(self)s ID-er. Verdien %(value)r er ikke gyldig."
+msgstr[1] ""
+"Skriv inn gyldige %(self)s ID-er. Verdiene %(value)r er ikke gyldige."
-#: contrib/admin/templates/admin/pagination.html:10
-msgid "Show all"
-msgstr "Vis alle"
+#: newforms/fields.py:52
+msgid "Enter a valid value."
+msgstr "Skriv inn en gyldig verdi."
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django administrasjonsside"
+#: newforms/fields.py:129
+#, python-format
+msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
+msgstr "Pass på at denne er på maks %(max)d tegn (den er %(length)d)."
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Django-administrasjon"
+#: newforms/fields.py:130
+#, python-format
+msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
+msgstr "Pass på at denne er på minst %(min)d tegn (den er %(length)d)."
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filter"
+#: newforms/fields.py:158 newforms/fields.py:187 newforms/fields.py:216
+#, python-format
+msgid "Ensure this value is less than or equal to %s."
+msgstr "Pass på at denne er mindre eller lik %s."
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Fant ikke siden"
+#: newforms/fields.py:159 newforms/fields.py:188 newforms/fields.py:217
+#, python-format
+msgid "Ensure this value is greater than or equal to %s."
+msgstr "Pass på at denne er større eller lik %s."
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Beklager, men siden du spør etter finnes ikke."
+#: newforms/fields.py:186 newforms/fields.py:215
+msgid "Enter a number."
+msgstr "Skriv inn et tall."
-#: contrib/admin/templates/admin/index.html:17
+#: newforms/fields.py:218
#, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeller tilgjengelig i %(name)s-applikasjonen."
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Pass på at det ikke er mer enn %s siffer totalt."
-#: contrib/admin/templates/admin/index.html:18
+#: newforms/fields.py:219
#, python-format
-msgid "%(name)s"
-msgstr ""
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Pass på at ikke er mer enn %s desimaler."
-#: contrib/admin/templates/admin/index.html:28
-#: contrib/admin/templates/admin/change_form.html:15
-msgid "Add"
-msgstr "Legg til"
+#: newforms/fields.py:220
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Pass på at det ikke er mer enn %s siffer foran komma."
-#: contrib/admin/templates/admin/index.html:34
-msgid "Change"
-msgstr "Endre"
+#: newforms/fields.py:268 newforms/fields.py:781
+msgid "Enter a valid date."
+msgstr "Skriv inn en gyldig dato."
-#: contrib/admin/templates/admin/index.html:44
-msgid "You don't have permission to edit anything."
-msgstr "Du har ikke rettigheter til å endre noe."
+#: newforms/fields.py:301 newforms/fields.py:782
+msgid "Enter a valid time."
+msgstr "Skriv inn et gyldig tidspunkt."
-#: contrib/admin/templates/admin/index.html:52
-msgid "Recent Actions"
-msgstr "Siste handlinger"
+#: newforms/fields.py:340
+msgid "Enter a valid date/time."
+msgstr "Skriv inn et gyldig tidspunkt."
-#: contrib/admin/templates/admin/index.html:53
-msgid "My Actions"
-msgstr "Mine handlinger"
+#: newforms/fields.py:427
+msgid "No file was submitted."
+msgstr "Ingen fil ble sendt."
-#: contrib/admin/templates/admin/index.html:57
-msgid "None available"
-msgstr "Ingen tilgjengelige"
+#: newforms/fields.py:428 oldforms/__init__.py:693
+msgid "The submitted file is empty."
+msgstr "Filen er tom."
-#: contrib/admin/templates/admin/change_form.html:22
-msgid "View on site"
-msgstr "Vis på nettsted"
+#: newforms/fields.py:524
+msgid "Enter a valid URL."
+msgstr "Skriv inn en gyldig nettadresse."
-#: contrib/admin/templates/admin/change_form.html:32
-#: contrib/admin/templates/admin/auth/user/change_password.html:24
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Vennligst fiks feilen under."
-msgstr[1] "Vennligst fiks feilene under."
+#: newforms/fields.py:525
+msgid "This URL appears to be a broken link."
+msgstr "Denne nettadressen fører til en side som ikke eksisterer."
-#: contrib/admin/templates/admin/change_form.html:50
-msgid "Ordering"
-msgstr "Rekkefølge"
+#: newforms/fields.py:590 newforms/models.py:306
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Velg et gyldig valg. Ditt valg er ikke et av de tilgjengelige valgene."
-#: contrib/admin/templates/admin/change_form.html:53
-msgid "Order:"
-msgstr "Rekkefølge:"
+#: newforms/fields.py:629
+#, 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."
-#: contrib/admin/templates/admin/base.html:25
-msgid "Welcome,"
-msgstr "Velkommen,"
+#: newforms/fields.py:630 newforms/fields.py:692 newforms/models.py:373
+msgid "Enter a list of values."
+msgstr "Skriv inn en liste med verdier."
-#: contrib/admin/templates/admin/delete_confirmation.html:9
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
-msgstr "Slett"
+#: newforms/fields.py:810
+msgid "Enter a valid IPv4 address."
+msgstr "Skriv inn en gyldig IPv4-adresse."
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: newforms/models.py:374
#, 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 ""
-"Hivs du sletter %(object_name)s '%(escaped_object)s', vil du også slette "
-"relaterte objekter, men du har ikke tillatelse til å slette følgende "
-"objektene:"
+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."
-#: contrib/admin/templates/admin/delete_confirmation.html:21
+#: oldforms/__init__.py:409
#, python-format
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
-"All of the following related items will be deleted:"
-msgstr ""
-"Er du sikker på at du vill slette %(object_name)s \"%(escaped_object)s\"? "
-"Alle de følgende relaterte objektene vil bli slettet:"
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Pass på at teksten er kortere enn %s tegn."
+msgstr[1] "Pass på at teksten er kortere enn %s tegn."
-#: contrib/admin/templates/admin/delete_confirmation.html:26
-msgid "Yes, I'm sure"
-msgstr "Ja, jeg er sikker"
+#: oldforms/__init__.py:414
+msgid "Line breaks are not allowed here."
+msgstr "Det er ikke tillatt med linjeskift her."
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-msgstr "Lagre som ny"
+#: oldforms/__init__.py:512 oldforms/__init__.py:586 oldforms/__init__.py:625
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Velg et gyldig valg. '%(data)s' er ikke i %(choices)s."
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-msgstr "Lagre og legg til ny"
+#: oldforms/__init__.py:754
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Skriv inn et heltall mellom -32768 og 32767."
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-msgstr "Lagre og fortsett å endre"
+#: oldforms/__init__.py:764
+msgid "Enter a positive number."
+msgstr "Skriv inn et positivt heltall."
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
-msgstr "Lagre"
+#: oldforms/__init__.py:774
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Skriv inn et heltall mellom 0 og 32767."
+
+#: template/defaultfilters.py:698
+msgid "yes,no,maybe"
+msgstr "ja,nei,kanskje"
-#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#: template/defaultfilters.py:729
#, python-format
-msgid "Enter a new password for the user %(username)s."
-msgstr "Skriv inn et nytt passord for brukeren %(username)s."
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
-msgid "Password"
-msgstr "Passord"
+#: template/defaultfilters.py:731
+#, python-format
+msgid "%.1f KB"
+msgstr ""
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-msgid "Password (again)"
-msgstr "Passord (gjenta)"
+#: template/defaultfilters.py:733
+#, python-format
+msgid "%.1f MB"
+msgstr ""
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-msgid "Enter the same password as above, for verification."
-msgstr "Skriv inn det samme passordet som ovenfor, for verifisering."
+#: template/defaultfilters.py:734
+#, python-format
+msgid "%.1f GB"
+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."
-msgstr "Skriv først inn brukernavn og passord. Deretter vil du få mulighet "
-"til å endre flere brukerinnstillinger."
+#: utils/dateformat.py:41
+msgid "p.m."
+msgstr ""
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
-msgid "Username"
-msgstr "Brukernavn"
+#: utils/dateformat.py:42
+msgid "a.m."
+msgstr ""
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
-msgid "Password change"
-msgstr "Endre passord"
+#: utils/dateformat.py:47
+msgid "PM"
+msgstr ""
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
-msgid "Password change successful"
-msgstr "Passordet er endret"
+#: utils/dateformat.py:48
+msgid "AM"
+msgstr ""
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-msgstr "Ditt passord er endret."
+#: utils/dateformat.py:97
+msgid "midnight"
+msgstr "midnatt"
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-#: contrib/admin/templates/registration/password_reset_form.html:10
-#: contrib/admin/templates/registration/password_reset_done.html:4
-msgid "Password reset"
-msgstr "Tilbakestill passord"
+#: utils/dateformat.py:99
+msgid "noon"
+msgstr "middag"
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"Har du glemt passordet ditt? Skriv inn e-postadressen din under, så sender "
-"vi deg et nytt passord til deg."
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Mandag"
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "E-postadresse:"
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Tirsdag"
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Tilbakestill mitt passord"
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Onsdag"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Takk for at du valgte å bruke kvalitetstid på nettstedet i dag."
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Torsdag"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Logg inn igjen"
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Fredag"
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Passordet ble tilbakestilt"
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Lørdag"
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"Vi har sendt deg et nytt passord til e-postadressen du oppgav. Du vil "
-"forhåpentligvis motta det snart."
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Søndag"
-#: 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 ""
-"Venligst skriv inn ditt gamle passord, av sikkerthetsårsaker. Skriv deretter "
-"inn ditt nye passord to ganger, slik at vi kan kontrollere at det er rett."
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "Man"
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "Gammelt passord:"
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "Tirs"
-#: contrib/admin/templates/registration/password_change_form.html:19
-msgid "New password:"
-msgstr "Nytt passord:"
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "Ons"
-#: contrib/admin/templates/registration/password_change_form.html:21
-msgid "Confirm password:"
-msgstr "Gjenta nytt passord:"
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "Tors"
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
-msgstr "Endre passord"
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "Fre"
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-msgstr ""
-"Du har mottatt denne e-posten fordi du ba om å tilbakestille passordet ditt"
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "Lør"
-#: contrib/admin/templates/registration/password_reset_email.html:3
-#, python-format
-msgid "for your user account at %(site_name)s"
-msgstr "for din konto hos %(site_name)s"
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "Søn"
-#: contrib/admin/templates/registration/password_reset_email.html:5
-#, python-format
-msgid "Your new password is: %(new_password)s"
-msgstr "Ditt nye passord er: %(new_password)s"
+#: utils/dates.py:18
+msgid "January"
+msgstr "Januar"
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-msgstr "Du kan endre dette passordet ved å gå til denne siden:"
+#: utils/dates.py:18
+msgid "February"
+msgstr "Februar"
-#: contrib/admin/templates/registration/password_reset_email.html:11
-msgid "Your username, in case you've forgotten:"
-msgstr "I tilfellet du har glemt brukernavnet ditt, så er det:"
+#: utils/dates.py:18 utils/dates.py:31
+msgid "March"
+msgstr "Mars"
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
-msgstr "Takk for at du bruker siden vår!"
+#: utils/dates.py:18 utils/dates.py:31
+msgid "April"
+msgstr "April"
-#: contrib/admin/templates/registration/password_reset_email.html:15
-#, python-format
-msgid "The %(site_name)s team"
-msgstr "Hilsen %(site_name)s"
+#: utils/dates.py:18 utils/dates.py:31
+msgid "May"
+msgstr "Mai"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
-msgstr "Bokmerker"
+#: utils/dates.py:18 utils/dates.py:31
+msgid "June"
+msgstr "Juni"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
-msgid "Documentation bookmarklets"
-msgstr "Dokumentasjonsbokmerker"
+#: utils/dates.py:19 utils/dates.py:31
+msgid "July"
+msgstr "Juli"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
-msgid ""
-"\n"
-"
To install bookmarklets, drag the link to your bookmarks\n"
-"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site. Note that some of these\n"
-"bookmarklets require you to be viewing the site from a computer designated\n"
-"as \"internal\" (talk to your system administrator if you aren't sure if\n"
-"your computer is \"internal\").
\n"
-msgstr ""
-"\n"
-"
For å installere bokmerker, dra linken til verktøylinja\n"
-"for bokmerker, eller høyreklikk og legg til i bokmerker. Nå kan du du velge\n"
-"bokmerket fra hvilken som helst side på nettstedet. Noen av disse\n"
-"bokmerkene krever at datamaskinen du bruker er markert som \"intern\"\n"
-"(kontakt din systemadministrator hvis du er usikker på om maskinen din er "
-"\"intern\").
\n"
+#: utils/dates.py:19
+msgid "August"
+msgstr "August"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-msgstr "Dokumentasjon for denne siden"
+#: utils/dates.py:19
+msgid "September"
+msgstr "September"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid ""
-"Jumps you from any page to the documentation for the view that generates "
-"that page."
-msgstr ""
-"Hopp fra hvilken som helst side til dokumentasjonen for visnings funksjonen "
-"som laget siden."
+#: utils/dates.py:19
+msgid "October"
+msgstr "Oktober"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
-msgstr "Vis objekt-ID"
+#: utils/dates.py:19
+msgid "November"
+msgstr "November"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid ""
-"Shows the content-type and unique ID for pages that represent a single "
-"object."
-msgstr ""
-"Viser \"content-type\" og en unik ID for sider som representerer et enkelt "
-"objekt."
+#: utils/dates.py:20
+msgid "December"
+msgstr "Desember"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-msgstr "Endre dette objektet (nåværende vindu)"
+#: utils/dates.py:23
+msgid "jan"
+msgstr "jan"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
-"Hopper til administrasjonsiden for sider som representerer et enkelt objekt."
+#: utils/dates.py:23
+msgid "feb"
+msgstr "feb"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-msgstr "Endre dette objektet (nytt vindu)"
+#: utils/dates.py:23
+msgid "mar"
+msgstr "mar"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
-msgstr "Samme som over, men åpner administrasjonsiden i et nytt vindu."
+#: utils/dates.py:23
+msgid "apr"
+msgstr "apr"
-#: contrib/localflavor/no/forms.py:14 contrib/localflavor/ch/forms.py:18
-msgid "Enter a zip code in the format XXXX."
-msgstr "Skriv inn et postnummer som XXXX."
+#: utils/dates.py:23
+msgid "may"
+msgstr "mai"
-#: contrib/localflavor/no/forms.py:35
-msgid "Enter a valid Norwegian social security number."
-msgstr "Skriv et gyldig norsk personnummer."
+#: utils/dates.py:23
+msgid "jun"
+msgstr "jun"
-#: template/defaultfilters.py:485
-msgid "yes,no,maybe"
-msgstr "ja,nei,kanskje"
+#: utils/dates.py:24
+msgid "jul"
+msgstr "jul"
-#: template/defaultfilters.py:514
-#, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
+#: utils/dates.py:24
+msgid "aug"
+msgstr "aug"
-#: template/defaultfilters.py:516
-#, python-format
-msgid "%.1f KB"
-msgstr ""
+#: utils/dates.py:24
+msgid "sep"
+msgstr "sep"
-#: template/defaultfilters.py:518
-#, python-format
-msgid "%.1f MB"
-msgstr ""
+#: utils/dates.py:24
+msgid "oct"
+msgstr "okt"
-#: template/defaultfilters.py:519
-#, python-format
-msgid "%.1f GB"
-msgstr ""
+#: utils/dates.py:24
+msgid "nov"
+msgstr "nov"
-#: oldforms/__init__.py:408
-#, python-format
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] "Sjekk at teksten er kortere enn %s tegn."
-msgstr[1] "Sjekk at teksten er kortere enn %s tegn."
+#: utils/dates.py:24
+msgid "dec"
+msgstr "des"
-#: oldforms/__init__.py:413
-msgid "Line breaks are not allowed here."
-msgstr "Det er ikke tillatt med linjeskift her."
+#: utils/dates.py:31
+msgid "Jan."
+msgstr "Jan."
-#: oldforms/__init__.py:511 oldforms/__init__.py:585 oldforms/__init__.py:624
-#, python-format
-msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr "Velg et gyldig valg; '%(data)s' er ikke i %(choices)s."
+#: utils/dates.py:31
+msgid "Feb."
+msgstr "Feb."
-#: oldforms/__init__.py:688 newforms/fields.py:380
-msgid "The submitted file is empty."
-msgstr "Filen er tom."
+#: utils/dates.py:32
+msgid "Aug."
+msgstr "Aug."
-#: oldforms/__init__.py:744
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Skriv inn et heltall mellom -32768 og 32767."
+#: utils/dates.py:32
+msgid "Sept."
+msgstr "Sept."
-#: oldforms/__init__.py:754
-msgid "Enter a positive number."
-msgstr "Skriv inn et positivt heltall."
+#: utils/dates.py:32
+msgid "Oct."
+msgstr "Okt."
-#: oldforms/__init__.py:764
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "Skriv inn et heltall mellom 0 og 32767."
+#: utils/dates.py:32
+msgid "Nov."
+msgstr "Nov."
-#: newforms/models.py:180 newforms/fields.py:478
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Velg et gyldig valg. Ditt valg er ikke et av de gyldige valgene."
+#: utils/dates.py:32
+msgid "Dec."
+msgstr "Des."
-#: newforms/models.py:197 newforms/fields.py:494 newforms/fields.py:570
-msgid "Enter a list of values."
-msgstr "Skriv inn en liste med verdier."
+#: utils/text.py:128
+msgid "or"
+msgstr "eller"
-#: newforms/models.py:203 newforms/fields.py:500
-#, 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."
+#: utils/timesince.py:21
+msgid "year"
+msgid_plural "years"
+msgstr[0] "år"
+msgstr[1] "år"
-#: newforms/fields.py:116
-#, python-format
-msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
-msgstr "Pass på at denne er på maks %(max)d tegn (den er %(length)d)."
+#: utils/timesince.py:22
+msgid "month"
+msgid_plural "months"
+msgstr[0] "måned"
+msgstr[1] "måneder"
-#: newforms/fields.py:118
-#, python-format
-msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
-msgstr "Pass på at denne er på minst %(min)d tegn (den er %(length)d)."
+#: utils/timesince.py:23
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "uke"
+msgstr[1] "uker"
-#: newforms/fields.py:144 newforms/fields.py:167 newforms/fields.py:197
-#, python-format
-msgid "Ensure this value is less than or equal to %s."
-msgstr "Pass på at denne er mindre eller lik %s."
+#: utils/timesince.py:24
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dag"
+msgstr[1] "dager"
-#: newforms/fields.py:146 newforms/fields.py:169 newforms/fields.py:199
-#, python-format
-msgid "Ensure this value is greater than or equal to %s."
-msgstr "Pass på at denne er større eller lik %s."
+#: utils/timesince.py:25
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "time"
+msgstr[1] "timer"
-#: newforms/fields.py:165 newforms/fields.py:192
-msgid "Enter a number."
-msgstr "Skriv inn et tall."
+#: utils/timesince.py:26
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minutt"
+msgstr[1] "minutter"
-#: newforms/fields.py:201
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr "Pass på at det ikke er mer enn %s siffer totalt."
+#: utils/timesince.py:46
+msgid "minutes"
+msgstr "minutter"
-#: newforms/fields.py:203
+#: utils/timesince.py:51
#, python-format
-msgid "Ensure that there are no more than %s decimal places."
-msgstr "Pass på at ikke er mer enn %s desimaler."
+msgid "%(number)d %(type)s"
+msgstr ""
-#: newforms/fields.py:205
+#: utils/timesince.py:57
#, python-format
-msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Pass på at det ikke er mer enn %s siffer foran komma."
+msgid ", %(number)d %(type)s"
+msgstr ""
-#: newforms/fields.py:238 newforms/fields.py:610
-msgid "Enter a valid date."
-msgstr "Skriv inn en gyldig dato."
+#: utils/translation/trans_real.py:412
+msgid "DATE_FORMAT"
+msgstr "j. M Y"
-#: newforms/fields.py:265 newforms/fields.py:612
-msgid "Enter a valid time."
-msgstr "Skriv inn et gyldig tidspunkt."
+#: utils/translation/trans_real.py:413
+msgid "DATETIME_FORMAT"
+msgstr "H:i, j. M Y"
-#: newforms/fields.py:301
-msgid "Enter a valid date/time."
-msgstr "Skriv inn et gyldig tidspunkt."
+#: utils/translation/trans_real.py:414
+msgid "TIME_FORMAT"
+msgstr "H:i"
-#: newforms/fields.py:314
-msgid "Enter a valid value."
-msgstr "Skriv inn en gyldig verdi."
+#: utils/translation/trans_real.py:430
+msgid "YEAR_MONTH_FORMAT"
+msgstr "M Y"
-#: newforms/fields.py:378
-msgid "No file was submitted."
-msgstr "Ingen fil ble sendt."
+#: utils/translation/trans_real.py:431
+msgid "MONTH_DAY_FORMAT"
+msgstr "j. M"
-#: newforms/fields.py:403 newforms/fields.py:425
-msgid "Enter a valid URL."
-msgstr "Skriv inn en gyldig URL."
+#: views/generic/create_update.py:43
+#, python-format
+msgid "The %(verbose_name)s was created successfully."
+msgstr "%(verbose_name)s ble opprettet."
-#: newforms/fields.py:427
-msgid "This URL appears to be a broken link."
-msgstr "Denne URL'en fører til en side som ikke eksisterer."
+#: views/generic/create_update.py:117
+#, python-format
+msgid "The %(verbose_name)s was updated successfully."
+msgstr "%(verbose_name)s ble oppdatert."
+#: views/generic/create_update.py:184
+#, python-format
+msgid "The %(verbose_name)s was deleted."
+msgstr "%(verbose_name)s ble slettet."
diff --git a/django/conf/locale/pl/LC_MESSAGES/django.mo b/django/conf/locale/pl/LC_MESSAGES/django.mo
index 5cdabb1d11..9ad15e833a 100644
Binary files a/django/conf/locale/pl/LC_MESSAGES/django.mo and b/django/conf/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pl/LC_MESSAGES/django.po b/django/conf/locale/pl/LC_MESSAGES/django.po
index 6f73bb45d0..77605f1627 100644
--- a/django/conf/locale/pl/LC_MESSAGES/django.po
+++ b/django/conf/locale/pl/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-24 07:36+0200\n"
+"POT-Creation-Date: 2008-07-27 21:57+0200\n"
"PO-Revision-Date: 2008-02-25 15:53+0100\n"
"Last-Translator: Jarek Zgoda \n"
"Language-Team: Polish \n"
@@ -246,49 +246,207 @@ msgstr "Ten miesiąc"
msgid "This year"
msgstr "Ten rok"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Yes"
msgstr "Tak"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "No"
msgstr "Nie"
-#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Unknown"
msgstr "Nieznany"
-#: contrib/admin/models.py:18
+#: contrib/admin/models.py:19
msgid "action time"
msgstr "czas akcji"
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
msgid "object id"
msgstr "id obiektu"
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
msgid "object repr"
msgstr "reprezentacja obiektu"
-#: contrib/admin/models.py:23
+#: contrib/admin/models.py:24
msgid "action flag"
msgstr "flaga akcji"
-#: contrib/admin/models.py:24
+#: contrib/admin/models.py:25
msgid "change message"
msgstr "zmień wiadomość"
-#: contrib/admin/models.py:27
+#: contrib/admin/models.py:28
msgid "log entry"
msgstr "log"
-#: contrib/admin/models.py:28
+#: contrib/admin/models.py:29
msgid "log entries"
msgstr "logi"
+#: contrib/admin/options.py:161 contrib/admin/options.py:180
+msgid "None"
+msgstr "brak"
+
+#: contrib/admin/options.py:347 contrib/auth/admin.py:37
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" dodany pomyślnie."
+
+#: contrib/admin/options.py:351 contrib/admin/options.py:419
+#: contrib/auth/admin.py:42
+msgid "You may edit it again below."
+msgstr "Możesz ponownie edytować wpis poniżej."
+
+#: contrib/admin/options.py:361 contrib/admin/options.py:428
+#, python-format
+msgid "You may add another %s below."
+msgstr "Możesz dodać nowy wpis %s poniżej."
+
+#: contrib/admin/options.py:395
+#, python-format
+msgid "Changed %s."
+msgstr "Zmieniono %s"
+
+#: contrib/admin/options.py:395 contrib/admin/options.py:405
+#: core/validators.py:279 db/models/manipulators.py:305
+msgid "and"
+msgstr "i"
+
+#: contrib/admin/options.py:400
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "Dodano %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:404
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "Zmieniono %(list)s w %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:409
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "Usunięto %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:414
+msgid "No fields changed."
+msgstr "Żadne pole nie zmienione."
+
+#: contrib/admin/options.py:417
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" zostało pomyślnie zmienione."
+
+#: contrib/admin/options.py:425
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"%(name)s \"%(obj)s\" dodane pomyślnie. Możesz edytować ponownie wpis poniżej."
+
+#: contrib/admin/options.py:506
+#, python-format
+msgid "Add %s"
+msgstr "Dodaj %s"
+
+#: contrib/admin/options.py:568
+#, python-format
+msgid "Change %s"
+msgstr "Zmień %s"
+
+#: contrib/admin/options.py:598
+msgid "Database error"
+msgstr "Błąd bazy danych"
+
+#: contrib/admin/options.py:647
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)s \"%(obj)s\" usunięty pomyślnie."
+
+#: contrib/admin/options.py:653
+msgid "Are you sure?"
+msgstr "Jesteś pewien?"
+
+#: contrib/admin/options.py:680
+#, python-format
+msgid "Change history: %s"
+msgstr "Historia zmian: %s"
+
+#: contrib/admin/sites.py:18 contrib/admin/views/decorators.py:16
+#: contrib/auth/forms.py:70 contrib/comments/views/comments.py:56
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Proszę wpisać poprawną nazwę użytkownika i hasło. Uwaga: wielkość liter ma "
+"znaczenie."
+
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:68
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Zaloguj się ponownie. Twoja sesja wygasła lecz twoje zgłoszenie zostało "
+"zapisane."
+
+#: contrib/admin/sites.py:240 contrib/admin/views/decorators.py:75
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Twoja przeglądarka nie chce akceptować ciasteczek. Zmień jej ustawienia i "
+"spróbuj ponownie."
+
+#: contrib/admin/sites.py:254 contrib/admin/sites.py:260
+#: contrib/admin/views/decorators.py:92
+msgid "Usernames cannot contain the '@' character."
+msgstr "Nazwy użytkowników nie mogą zawierać znaków '@'."
+
+#: contrib/admin/sites.py:257 contrib/admin/views/decorators.py:88
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Twój adres e-mail to nie jest twój login. Spróbuj '%s'."
+
+#: contrib/admin/sites.py:325
+msgid "Site administration"
+msgstr "Administracja stroną"
+
+#: contrib/admin/sites.py:347 contrib/admin/templates/admin/login.html:27
+#: contrib/admin/views/decorators.py:30
+msgid "Log in"
+msgstr "Zaloguj się"
+
+#: contrib/admin/util.py:126
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Jedno lub więcej %(fieldname)s w %(name)s: %(obj)s"
+
+#: contrib/admin/util.py:131
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Jedno lub więcej %(fieldname)s w %(name)s:"
+
+#: contrib/admin/widgets.py:65
+msgid "Date:"
+msgstr "Data:"
+
+#: contrib/admin/widgets.py:65
+msgid "Time:"
+msgstr "Czas:"
+
+#: contrib/admin/widgets.py:89
+msgid "Currently:"
+msgstr "Teraz:"
+
+#: contrib/admin/widgets.py:89
+msgid "Change:"
+msgstr "Zmień:"
+
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
msgid "Page not found"
@@ -299,17 +457,17 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Niestety, żądana strona nie została znaleziona."
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:37
-#: contrib/admin/templates/admin/change_form.html:12
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:4
-#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
msgid "Home"
@@ -335,22 +493,28 @@ msgstr ""
"Wystąpił niespodziewany błąd. Raport został wysłany e-mailem "
"administratorowi strony."
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:25
msgid "Welcome,"
msgstr "Witaj,"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:25
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Documentation"
msgstr "Dokumentacja"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:45
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:13
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Change password"
msgstr "Zmiana hasła"
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/comments/templates/comments/form.html:6
msgid "Log out"
msgstr "Wyloguj się"
@@ -363,47 +527,44 @@ msgstr "Administracja stroną Django"
msgid "Django administration"
msgstr "Administracja Django"
-#: contrib/admin/templates/admin/change_form.html:14
-#: contrib/admin/templates/admin/index.html:28
+#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/index.html:29
msgid "Add"
msgstr "Dodaj"
-#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/change_form.html:26
+#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Historia"
-#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/change_form.html:27
msgid "View on site"
msgstr "Pokaż na stronie"
-#: contrib/admin/templates/admin/change_form.html:31
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:37
+#: contrib/admin/templates/admin/auth/user/change_password.html:22
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Proszę popraw poniższy błąd"
msgstr[1] "Proszę popraw poniższe błędy"
msgstr[2] "Proszę popraw poniższe błędy"
-#: contrib/admin/templates/admin/change_form.html:49
-msgid "Ordering"
-msgstr "Sortowanie"
-
-#: contrib/admin/templates/admin/change_form.html:52
-msgid "Order:"
-msgstr "Porządek:"
-
-#: contrib/admin/templates/admin/change_list.html:11
+#: contrib/admin/templates/admin/change_list.html:16
#, python-format
msgid "Add %(name)s"
msgstr "Dodaj %(name)s"
-#: contrib/admin/templates/admin/delete_confirmation.html:8
+#: contrib/admin/templates/admin/change_list.html:26
+msgid "Filter"
+msgstr "Filtr"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:9
#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
msgid "Delete"
msgstr "Usuń"
-#: contrib/admin/templates/admin/delete_confirmation.html:13
+#: contrib/admin/templates/admin/delete_confirmation.html:15
#, python-format
msgid ""
"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -414,7 +575,7 @@ msgstr ""
"zależnych obiektów, lecz nie posiadasz uprawnień do usunięcia następujących "
"typów obiektów:"
-#: contrib/admin/templates/admin/delete_confirmation.html:20
+#: contrib/admin/templates/admin/delete_confirmation.html:22
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -423,7 +584,7 @@ msgstr ""
"Czy chcesz skasować %(object_name)s \"%(escaped_object)s\"? Następujące "
"zależne obiekty zostaną skasowane:"
-#: contrib/admin/templates/admin/delete_confirmation.html:25
+#: contrib/admin/templates/admin/delete_confirmation.html:27
msgid "Yes, I'm sure"
msgstr "Tak, na pewno"
@@ -432,41 +593,37 @@ msgstr "Tak, na pewno"
msgid " By %(filter_title)s "
msgstr " Używając %(filter_title)s "
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filtr"
-
-#: contrib/admin/templates/admin/index.html:17
+#: contrib/admin/templates/admin/index.html:18
#, python-format
msgid "Models available in the %(name)s application."
msgstr "Modele dostępne w aplikacji %(name)s."
-#: contrib/admin/templates/admin/index.html:18
+#: contrib/admin/templates/admin/index.html:19
#, python-format
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/index.html:34
+#: contrib/admin/templates/admin/index.html:35
msgid "Change"
msgstr "Zmień"
-#: contrib/admin/templates/admin/index.html:44
+#: contrib/admin/templates/admin/index.html:45
msgid "You don't have permission to edit anything."
msgstr "Nie masz uprawnień by edytować cokolwiek"
-#: contrib/admin/templates/admin/index.html:52
+#: contrib/admin/templates/admin/index.html:53
msgid "Recent Actions"
msgstr "Ostatnie akcje"
-#: contrib/admin/templates/admin/index.html:53
+#: contrib/admin/templates/admin/index.html:54
msgid "My Actions"
msgstr "Moje akcje"
-#: contrib/admin/templates/admin/index.html:57
+#: contrib/admin/templates/admin/index.html:58
msgid "None available"
msgstr "Brak"
-#: contrib/admin/templates/admin/invalid_setup.html:8
+#: 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 "
@@ -476,39 +633,34 @@ msgstr ""
"tabele zostały utworzone i odpowiedni użytkownik jest uprawniony do ich "
"odczytu."
-#: contrib/admin/templates/admin/login.html:17
+#: contrib/admin/templates/admin/login.html:19
#: contrib/comments/templates/comments/form.html:6
#: contrib/comments/templates/comments/form.html:8
msgid "Username:"
msgstr "Nazwa użytkownika:"
-#: contrib/admin/templates/admin/login.html:20
+#: contrib/admin/templates/admin/login.html:22
#: contrib/comments/templates/comments/form.html:8
msgid "Password:"
msgstr "Hasło:"
-#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:31
-msgid "Log in"
-msgstr "Zaloguj się"
-
-#: contrib/admin/templates/admin/object_history.html:17
+#: contrib/admin/templates/admin/object_history.html:16
msgid "Date/time"
msgstr "Data/czas"
-#: contrib/admin/templates/admin/object_history.html:18
+#: contrib/admin/templates/admin/object_history.html:17
msgid "User"
msgstr "Użytkownik"
-#: contrib/admin/templates/admin/object_history.html:19
+#: contrib/admin/templates/admin/object_history.html:18
msgid "Action"
msgstr "Akcja"
-#: contrib/admin/templates/admin/object_history.html:25
+#: contrib/admin/templates/admin/object_history.html:24
msgid "DATE_WITH_TIME_FULL"
msgstr "j F Y H:i:s"
-#: contrib/admin/templates/admin/object_history.html:35
+#: contrib/admin/templates/admin/object_history.html:32
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
@@ -561,26 +713,29 @@ msgstr ""
"Najpierw podaj nazwę użytkownika i hasło. Następnie będziesz mógł edytować "
"więcej opcji użytkownika."
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
+#: contrib/admin/templates/admin/auth/user/add_form.html:13
+#: contrib/auth/forms.py:12 contrib/auth/forms.py:49
msgid "Username"
msgstr "Nazwa użytkownika"
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/add_form.html:20
#: contrib/admin/templates/admin/auth/user/change_password.html:33
+#: contrib/auth/forms.py:15 contrib/auth/forms.py:50 contrib/auth/forms.py:166
msgid "Password"
msgstr "Hasło"
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:38
+#: contrib/admin/templates/admin/auth/user/add_form.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/auth/forms.py:167
msgid "Password (again)"
msgstr "Hasło (powtórz)"
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: 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 "Podaj powyższe hasło w celu weryfikacji."
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:26
#, python-format
msgid "Enter a new password for the user %(username)s."
msgstr "Podaj nowe hasło dla użytkownika %(username)s."
@@ -661,41 +816,41 @@ msgstr "Dziękujemy za odwiedzenie serwisu."
msgid "Log in again"
msgstr "Zaloguj ponownie"
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_form.html:5
-#: contrib/admin/templates/registration/password_change_form.html:9
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
msgid "Password change"
msgstr "Zmiana hasła"
-#: contrib/admin/templates/registration/password_change_done.html:5
-#: contrib/admin/templates/registration/password_change_done.html:9
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
msgid "Password change successful"
msgstr "Hasło zmienione"
-#: contrib/admin/templates/registration/password_change_done.html:11
+#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
msgstr "Twoje hasło zostało zmienione"
-#: contrib/admin/templates/registration/password_change_form.html:11
+#: 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 "Podaj swoje stare hasło i dwa razy nowe."
-#: contrib/admin/templates/registration/password_change_form.html:16
+#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
msgstr "Stare hasło:"
-#: contrib/admin/templates/registration/password_change_form.html:18
+#: contrib/admin/templates/registration/password_change_form.html:19
msgid "New password:"
msgstr "Nowe hasło:"
-#: contrib/admin/templates/registration/password_change_form.html:20
+#: contrib/admin/templates/registration/password_change_form.html:21
msgid "Confirm password:"
msgstr "Potwierdź hasło:"
-#: contrib/admin/templates/registration/password_change_form.html:22
+#: contrib/admin/templates/registration/password_change_form.html:23
msgid "Change my password"
msgstr "Zmień hasło"
@@ -765,325 +920,210 @@ msgstr "Adres e-mail:"
msgid "Reset my password"
msgstr "Zresetuj moje hasło"
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Data:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Czas:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Teraz:"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Zmień:"
-
#: contrib/admin/templatetags/admin_list.py:257
msgid "All dates"
msgstr "Wszystkie daty"
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" dodany pomyślnie."
-
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
-#: contrib/admin/views/main.py:356
-msgid "You may edit it again below."
-msgstr "Możesz ponownie edytować wpis poniżej."
-
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr "Dodaj użytkownika"
-
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
-msgstr "Hasło zostało zmienione pomyślnie."
-
-#: contrib/admin/views/auth.py:65
+#: contrib/admin/views/main.py:65
#, python-format
-msgid "Change password: %s"
-msgstr "Zmień hasło: %s"
-
-#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Proszę wpisać poprawną nazwę użytkownika i hasło. Uwaga: wielkość liter ma "
-"znaczenie."
-
-#: contrib/admin/views/decorators.py:69
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"Zaloguj się ponownie. Twoja sesja wygasła lecz twoje zgłoszenie zostało "
-"zapisane."
-
-#: contrib/admin/views/decorators.py:76
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"Twoja przeglądarka nie chce akceptować ciasteczek. Zmień jej ustawienia i "
-"spróbuj ponownie."
+msgid "Select %s"
+msgstr "Zaznacz %s"
-#: contrib/admin/views/decorators.py:89
+#: contrib/admin/views/main.py:65
#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Twój adres e-mail to nie jest twój login. Spróbuj '%s'."
-
-#: contrib/admin/views/decorators.py:93
-msgid "Usernames cannot contain the '@' character."
-msgstr "Nazwy użytkowników nie mogą zawierać znaków '@'."
+msgid "Select %s to change"
+msgstr "Zaznacz %s aby zmienić"
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
-#: contrib/admin/views/doc.py:52
+#: contrib/admindocs/views.py:53 contrib/admindocs/views.py:55
+#: contrib/admindocs/views.py:57
msgid "tag:"
msgstr "tag:"
-#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
-#: contrib/admin/views/doc.py:83
+#: contrib/admindocs/views.py:87 contrib/admindocs/views.py:89
+#: contrib/admindocs/views.py:91
msgid "filter:"
msgstr "filtr:"
-#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
-#: contrib/admin/views/doc.py:141
+#: contrib/admindocs/views.py:153 contrib/admindocs/views.py:155
+#: contrib/admindocs/views.py:157
msgid "view:"
msgstr "widok:"
-#: contrib/admin/views/doc.py:166
+#: contrib/admindocs/views.py:187
#, python-format
msgid "App %r not found"
msgstr "Aplikacja %r nie została znaleziona"
-#: contrib/admin/views/doc.py:173
+#: contrib/admindocs/views.py:194
#, python-format
-msgid "Model %(name)r not found in app %(label)r"
-msgstr "Model %(name)r nie został znaleziony w aplikacji %(label)r"
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr "Model %(model_name)r nie został znaleziony w aplikacji %(app_label)r"
-#: contrib/admin/views/doc.py:185
+#: contrib/admindocs/views.py:206
#, python-format
-msgid "the related `%(label)s.%(type)s` object"
-msgstr "powiązany obiekt `%(label)s.%(type)s`"
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "powiązany obiekt `%(app_label)s.%(data_type)s`"
-#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
-#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
msgid "model:"
msgstr "model:"
-#: contrib/admin/views/doc.py:216
+#: contrib/admindocs/views.py:237
#, python-format
-msgid "related `%(label)s.%(name)s` objects"
-msgstr "powiązane obiekty `%(label)s.%(name)s`"
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "powiązane obiekty `%(app_label)s.%(object_name)s`"
-#: contrib/admin/views/doc.py:221
+#: contrib/admindocs/views.py:242
#, python-format
msgid "all %s"
msgstr "wszystkie %s"
-#: contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:247
#, python-format
msgid "number of %s"
msgstr "liczba %s"
-#: contrib/admin/views/doc.py:231
+#: contrib/admindocs/views.py:253
#, python-format
msgid "Fields on %s objects"
msgstr "Pola obiektów %s"
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
-#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
-#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
+#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:328
+#: contrib/admindocs/views.py:330 contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:337 contrib/admindocs/views.py:339
msgid "Integer"
msgstr "Liczba całkowita"
-#: contrib/admin/views/doc.py:294
+#: contrib/admindocs/views.py:318
msgid "Boolean (Either True or False)"
msgstr "Wartość logiczna (True, False - prawda lub fałsz)"
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
+#: contrib/admindocs/views.py:319 contrib/admindocs/views.py:338
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Łańcuch (do %(max_length)s znaków)"
-#: contrib/admin/views/doc.py:296
+#: contrib/admindocs/views.py:320
msgid "Comma-separated integers"
msgstr "Liczby całkowite rozdzielone przecinkami"
-#: contrib/admin/views/doc.py:297
+#: contrib/admindocs/views.py:321
msgid "Date (without time)"
msgstr "Data (bez godziny)"
-#: contrib/admin/views/doc.py:298
+#: contrib/admindocs/views.py:322
msgid "Date (with time)"
msgstr "Data (z godziną)"
-#: contrib/admin/views/doc.py:299
+#: contrib/admindocs/views.py:323
msgid "Decimal number"
msgstr "Numer dziesiętny"
-#: contrib/admin/views/doc.py:300
+#: contrib/admindocs/views.py:324
msgid "E-mail address"
msgstr "Adres e-mail"
-#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
-#: contrib/admin/views/doc.py:305
+#: contrib/admindocs/views.py:325 contrib/admindocs/views.py:326
+#: contrib/admindocs/views.py:329
msgid "File path"
msgstr "Ścieżka do pliku"
-#: contrib/admin/views/doc.py:303
+#: contrib/admindocs/views.py:327
msgid "Floating point number"
msgstr "Liczba zmiennoprzecinkowa"
-#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89
+#: contrib/admindocs/views.py:331 contrib/comments/models.py:89
msgid "IP address"
msgstr "Adres IP"
-#: contrib/admin/views/doc.py:309
+#: contrib/admindocs/views.py:333
msgid "Boolean (Either True, False or None)"
msgstr "Wartość logiczna (True, False, None - prawda, fałsz lub nic)"
-#: contrib/admin/views/doc.py:310
+#: contrib/admindocs/views.py:334
msgid "Relation to parent model"
msgstr "Relacja do modelu rodzica"
-#: contrib/admin/views/doc.py:311
+#: contrib/admindocs/views.py:335
msgid "Phone number"
msgstr "Numer telefonu"
-#: contrib/admin/views/doc.py:316
+#: contrib/admindocs/views.py:340
msgid "Text"
msgstr "Tekst"
-#: contrib/admin/views/doc.py:317
+#: contrib/admindocs/views.py:341
msgid "Time"
msgstr "Czas"
-#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:8
+#: contrib/admindocs/views.py:342 contrib/flatpages/models.py:8
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:319
+#: contrib/admindocs/views.py:343
msgid "U.S. state (two uppercase letters)"
msgstr "Stan USA (dwie duże litery)"
-#: contrib/admin/views/doc.py:320
+#: contrib/admindocs/views.py:344
msgid "XML text"
msgstr "Tekst XML"
-#: contrib/admin/views/doc.py:346
+#: contrib/admindocs/views.py:370
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s nie jest obiektem urlpattern"
-#: contrib/admin/views/main.py:233
-msgid "Site administration"
-msgstr "Administracja stroną"
-
-#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
-#, python-format
-msgid "You may add another %s below."
-msgstr "Możesz dodać nowy wpis %s poniżej."
-
-#: contrib/admin/views/main.py:298
-#, python-format
-msgid "Add %s"
-msgstr "Dodaj %s"
-
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Added %s."
-msgstr "Dodano %s"
-
-#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
-#: contrib/admin/views/main.py:348 core/validators.py:283
-#: db/models/manipulators.py:309
-msgid "and"
-msgstr "i"
+#: contrib/auth/admin.py:17
+msgid "Personal info"
+msgstr "Dane osobowe"
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Changed %s."
-msgstr "Zmieniono %s"
+#: contrib/auth/admin.py:18
+msgid "Permissions"
+msgstr "Uprawnienia"
-#: contrib/admin/views/main.py:348
-#, python-format
-msgid "Deleted %s."
-msgstr "Skasowano %s"
+#: contrib/auth/admin.py:19
+msgid "Important dates"
+msgstr "Ważne daty"
-#: contrib/admin/views/main.py:351
-msgid "No fields changed."
-msgstr "Żadne pole nie zmienione."
+#: contrib/auth/admin.py:20
+msgid "Groups"
+msgstr "Grupy"
-#: contrib/admin/views/main.py:354
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" zostało pomyślnie zmienione."
+#: contrib/auth/admin.py:47
+msgid "Add user"
+msgstr "Dodaj użytkownika"
-#: contrib/admin/views/main.py:362
-#, python-format
+#: contrib/auth/forms.py:13 contrib/auth/models.py:134
msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
+"digits and underscores)."
msgstr ""
-"%(name)s \"%(obj)s\" dodane pomyślnie. Możesz edytować ponownie wpis poniżej."
-
-#: contrib/admin/views/main.py:400
-#, python-format
-msgid "Change %s"
-msgstr "Zmień %s"
-
-#: contrib/admin/views/main.py:487
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Jedno lub więcej %(fieldname)s w %(name)s: %(obj)s"
-
-#: contrib/admin/views/main.py:492
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Jedno lub więcej %(fieldname)s w %(name)s:"
-
-#: contrib/admin/views/main.py:524
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" usunięty pomyślnie."
-
-#: contrib/admin/views/main.py:527
-msgid "Are you sure?"
-msgstr "Jesteś pewien?"
-
-#: contrib/admin/views/main.py:549
-#, python-format
-msgid "Change history: %s"
-msgstr "Historia zmian: %s"
+"Wymagane. 30 znaków lub mniej. Tylko znaki alfanumeryczne (litery, cyfry i "
+"podkreślenia)."
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s"
-msgstr "Zaznacz %s"
+#: contrib/auth/forms.py:14 core/validators.py:72
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "To pole może zawierać tylko litery, cyfry i podkreślenia."
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s to change"
-msgstr "Zaznacz %s aby zmienić"
+#: contrib/auth/forms.py:16
+msgid "Password confirmation"
+msgstr "Potwierdzenie hasła"
-#: contrib/admin/views/main.py:765
-msgid "Database error"
-msgstr "Błąd bazy danych"
+#: contrib/auth/forms.py:28
+msgid "A user with that username already exists."
+msgstr "Użytkownik o tej nazwie już istnieje."
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
+#: contrib/auth/forms.py:34 contrib/auth/forms.py:153
+#: contrib/auth/forms.py:178
msgid "The two password fields didn't match."
msgstr "Hasła się nie zgadzają."
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "Użytkownik o tej nazwie już istnieje."
+#: contrib/auth/forms.py:72 contrib/comments/views/comments.py:58
+msgid "This account is inactive."
+msgstr "To konto jest nieaktywne."
-#: contrib/auth/forms.py:53
+#: contrib/auth/forms.py:77 contrib/comments/views/comments.py:49
msgid ""
"Your Web browser doesn't appear to have cookies enabled. Cookies are "
"required for logging in."
@@ -1091,11 +1131,11 @@ msgstr ""
"Twoja przeglądarka nie chce akceptować ciasteczek. Są one wymagane do "
"zalogowania się."
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
-msgstr "To konto jest nieaktywne."
+#: contrib/auth/forms.py:90
+msgid "E-mail"
+msgstr "E-mail"
-#: contrib/auth/forms.py:84
+#: contrib/auth/forms.py:99
msgid ""
"That e-mail address doesn't have an associated user account. Are you sure "
"you've registered?"
@@ -1103,16 +1143,24 @@ msgstr ""
"Ten adres e-mail nie ma przypisanego konta. Jesteś pewien, że "
"zarejestrowałeś się?"
-#: contrib/auth/forms.py:107
+#: contrib/auth/forms.py:124
#, python-format
msgid "Password reset on %s"
msgstr "Hasło zresetowane dla %s"
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr "Pola 'nowe hasło' nie zgadzają się."
+#: contrib/auth/forms.py:131
+msgid "Old password"
+msgstr "Stare hasło"
-#: contrib/auth/forms.py:124
+#: contrib/auth/forms.py:132
+msgid "New password"
+msgstr "Nowe hasło"
+
+#: contrib/auth/forms.py:133
+msgid "New password confirmation"
+msgstr "Nowe hasło ponownie"
+
+#: contrib/auth/forms.py:145
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr "Podane stare hasło jest niepoprawne. Proszę podać je jeszcze raz."
@@ -1136,39 +1184,31 @@ msgstr "uprawnienia"
msgid "group"
msgstr "grupa"
-#: contrib/auth/models.py:98 contrib/auth/models.py:148
+#: contrib/auth/models.py:98 contrib/auth/models.py:144
msgid "groups"
msgstr "grupy"
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:134
msgid "username"
msgstr "użytkownik"
-#: contrib/auth/models.py:138
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
-msgstr ""
-"Wymagane. 30 znaków lub mniej. Tylko znaki alfanumeryczne (litery, cyfry i "
-"podkreślenia)."
-
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:135
msgid "first name"
msgstr "Imię"
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:136
msgid "last name"
msgstr "Nazwisko"
-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:137
msgid "e-mail address"
msgstr "adres e-mail"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:138
msgid "password"
msgstr "hasło"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:138
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the change "
"password form."
@@ -1176,19 +1216,19 @@ msgstr ""
"Użyj '[algo]$[salt]$[hexdigest]' lub formularza zmiany "
"hasła."
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:139
msgid "staff status"
msgstr "w zespole"
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:139
msgid "Designates whether the user can log into this admin site."
msgstr "Oznacza czy użytkownik może zalogować się do panelu admina."
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:140
msgid "active"
msgstr "aktywny"
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:140
msgid ""
"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
@@ -1196,11 +1236,11 @@ msgstr ""
"Oznacza czy użytkownika należy uważać za aktywnego. Odznacz tozamiast usuwać "
"konta."
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:141
msgid "superuser status"
msgstr "Główny Administrator"
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:141
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
@@ -1208,15 +1248,15 @@ msgstr ""
"Oznacza, że ten użytkownik ma wszystkie uprawnienia bez jawnego "
"przypisywania ich."
-#: contrib/auth/models.py:146
+#: contrib/auth/models.py:142
msgid "last login"
msgstr "ostatnio zalogowany"
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:143
msgid "date joined"
msgstr "data przyłączenia"
-#: contrib/auth/models.py:149
+#: contrib/auth/models.py:145
msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
@@ -1224,43 +1264,36 @@ msgstr ""
"Oprócz uprawnień przypisanych bezpośrednio użytkownikowi otrzyma on "
"uprawnienia grup, do których należy."
-#: contrib/auth/models.py:150
+#: contrib/auth/models.py:146
msgid "user permissions"
msgstr "uprawnienia użytkownika"
-#: contrib/auth/models.py:154
+#: contrib/auth/models.py:150
msgid "user"
msgstr "użytkownik"
-#: contrib/auth/models.py:155
+#: contrib/auth/models.py:151
msgid "users"
msgstr "użytkownicy"
-#: contrib/auth/models.py:161
-msgid "Personal info"
-msgstr "Dane osobowe"
-
-#: contrib/auth/models.py:162
-msgid "Permissions"
-msgstr "Uprawnienia"
-
-#: contrib/auth/models.py:163
-msgid "Important dates"
-msgstr "Ważne daty"
-
-#: contrib/auth/models.py:164
-msgid "Groups"
-msgstr "Grupy"
-
-#: contrib/auth/models.py:323
+#: contrib/auth/models.py:306
msgid "message"
msgstr "wiadomość"
-#: contrib/auth/views.py:48
+#: contrib/auth/views.py:49
msgid "Logged out"
msgstr "Wylogowany"
-#: contrib/comments/models.py:71 contrib/comments/models.py:176
+#: contrib/auth/views.py:116
+msgid "Password changed successfully."
+msgstr "Hasło zostało zmienione pomyślnie."
+
+#: contrib/auth/views.py:122
+#, python-format
+msgid "Change password: %s"
+msgstr "Zmień hasło: %s"
+
+#: contrib/comments/models.py:71 contrib/comments/models.py:164
msgid "object ID"
msgstr "ID obiektu"
@@ -1269,7 +1302,7 @@ msgid "headline"
msgstr "nagłówek"
#: contrib/comments/models.py:73 contrib/comments/models.py:95
-#: contrib/comments/models.py:177
+#: contrib/comments/models.py:165
msgid "comment"
msgstr "komentarz"
@@ -1309,11 +1342,11 @@ msgstr "ocena #8"
msgid "is valid rating"
msgstr "jest poprawną oceną"
-#: contrib/comments/models.py:87 contrib/comments/models.py:179
+#: contrib/comments/models.py:87 contrib/comments/models.py:167
msgid "date/time submitted"
msgstr "data/czas dodania"
-#: contrib/comments/models.py:88 contrib/comments/models.py:180
+#: contrib/comments/models.py:88 contrib/comments/models.py:168
msgid "is public"
msgstr "publicznie dostępny"
@@ -1333,11 +1366,11 @@ msgstr ""
msgid "comments"
msgstr "komentarze"
-#: contrib/comments/models.py:140 contrib/comments/models.py:222
+#: contrib/comments/models.py:128 contrib/comments/models.py:199
msgid "Content object"
msgstr "Obiekt treści"
-#: contrib/comments/models.py:168
+#: contrib/comments/models.py:156
#, python-format
msgid ""
"Posted by %(user)s at %(date)s\n"
@@ -1352,48 +1385,48 @@ msgstr ""
"\n"
"http://%(domain)s%(url)s"
-#: contrib/comments/models.py:178
+#: contrib/comments/models.py:166
msgid "person's name"
msgstr "Nazwa osoby"
-#: contrib/comments/models.py:181
+#: contrib/comments/models.py:169
msgid "ip address"
msgstr "adres ip"
-#: contrib/comments/models.py:183
+#: contrib/comments/models.py:171
msgid "approved by staff"
msgstr "zaakceptowano"
-#: contrib/comments/models.py:187
+#: contrib/comments/models.py:175
msgid "free comment"
msgstr "wolny komentarz"
-#: contrib/comments/models.py:188
+#: contrib/comments/models.py:176
msgid "free comments"
msgstr "wolne komentarze"
-#: contrib/comments/models.py:250
+#: contrib/comments/models.py:227
msgid "score"
msgstr "ilość punktów"
-#: contrib/comments/models.py:251
+#: contrib/comments/models.py:228
msgid "score date"
msgstr "data przyznania punktów"
-#: contrib/comments/models.py:255
+#: contrib/comments/models.py:232
msgid "karma score"
msgstr "ilość punktów"
-#: contrib/comments/models.py:256
+#: contrib/comments/models.py:233
msgid "karma scores"
msgstr "wyniki"
-#: contrib/comments/models.py:260
+#: contrib/comments/models.py:237
#, python-format
msgid "%(score)d rating by %(user)s"
msgstr "%(score)d ocenę przez %(user)s"
-#: contrib/comments/models.py:277
+#: contrib/comments/models.py:254
#, python-format
msgid ""
"This comment was flagged by %(user)s:\n"
@@ -1404,36 +1437,36 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/models.py:285
+#: contrib/comments/models.py:262
msgid "flag date"
msgstr "data flagi"
-#: contrib/comments/models.py:289
+#: contrib/comments/models.py:266
msgid "user flag"
msgstr "flaga użytkownika"
-#: contrib/comments/models.py:290
+#: contrib/comments/models.py:267
msgid "user flags"
msgstr "flagi użytkownika"
-#: contrib/comments/models.py:294
+#: contrib/comments/models.py:271
#, python-format
msgid "Flag by %r"
msgstr "Flaga %r"
-#: contrib/comments/models.py:300
+#: contrib/comments/models.py:277
msgid "deletion date"
msgstr "data skasowania"
-#: contrib/comments/models.py:303
+#: contrib/comments/models.py:280
msgid "moderator deletion"
msgstr "usunięcie moderatora"
-#: contrib/comments/models.py:304
+#: contrib/comments/models.py:281
msgid "moderator deletions"
msgstr "usunięcia moderatorów"
-#: contrib/comments/models.py:308
+#: contrib/comments/models.py:285
#, python-format
msgid "Moderator deletion by %r"
msgstr "Usunięcie moderatora przez %r"
@@ -1474,12 +1507,12 @@ msgstr "Podgląd"
msgid "Your name:"
msgstr "Twoje imię:"
-#: contrib/comments/views/comments.py:28
+#: contrib/comments/views/comments.py:76
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr "Ta ocena jest wymagana gdyż podałeś przynajmniej jedną inną ocenę."
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:160
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
@@ -1507,7 +1540,7 @@ msgstr[2] ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:117
+#: contrib/comments/views/comments.py:165
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -1518,25 +1551,25 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:190
-#: contrib/comments/views/comments.py:283
+#: contrib/comments/views/comments.py:238
+#: contrib/comments/views/comments.py:331
msgid "Only POSTs are allowed"
msgstr "Dozwolone tylko POSTy"
-#: contrib/comments/views/comments.py:194
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:242
+#: contrib/comments/views/comments.py:335
msgid "One or more of the required fields wasn't submitted"
msgstr "Jedno lub więcej wymaganych pól nie zostało wypełnionych"
-#: contrib/comments/views/comments.py:198
-#: contrib/comments/views/comments.py:289
+#: contrib/comments/views/comments.py:246
+#: contrib/comments/views/comments.py:337
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
"Ktoś próbował obejść zabezpieczenia formularza komentarzy (naruszenie "
"bezpieczeństwa)"
-#: contrib/comments/views/comments.py:208
-#: contrib/comments/views/comments.py:295
+#: contrib/comments/views/comments.py:256
+#: contrib/comments/views/comments.py:343
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
@@ -1544,8 +1577,8 @@ msgstr ""
"Formularz komentarza miał niepoprawny parametr 'target' -- ID obiektu było "
"niepoprawne"
-#: contrib/comments/views/comments.py:259
-#: contrib/comments/views/comments.py:324
+#: contrib/comments/views/comments.py:307
+#: contrib/comments/views/comments.py:372
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr "Formularz komentarza nie zapewnił obiektów 'preview' ani 'post'"
@@ -1573,6 +1606,10 @@ msgstr "typ zawartości"
msgid "content types"
msgstr "typy zawartości"
+#: contrib/flatpages/admin.py:9
+msgid "Advanced options"
+msgstr "Opcje zaawansowane"
+
#: contrib/flatpages/models.py:9
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -1621,10 +1658,6 @@ msgstr "strona statyczna"
msgid "flat pages"
msgstr "strony statyczne"
-#: contrib/flatpages/models.py:27
-msgid "Advanced options"
-msgstr "Opcje zaawansowane"
-
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "-y"
@@ -1735,6 +1768,53 @@ msgstr "Podaj poprawny numer CUIT w formacie XX-XXXXXXXX-X lub XXXXXXXXXXXX."
msgid "Invalid CUIT."
msgstr "Niepoprawny CUIT"
+#: contrib/localflavor/at/at_states.py:5
+#, fuzzy
+msgid "Burgenland"
+msgstr "Fryzja"
+
+#: contrib/localflavor/at/at_states.py:6
+msgid "Carinthia"
+msgstr "Karyntia"
+
+#: contrib/localflavor/at/at_states.py:7
+msgid "Lower Austria"
+msgstr "Dolna Austria"
+
+#: contrib/localflavor/at/at_states.py:8
+msgid "Upper Austria"
+msgstr "Górna Austria"
+
+#: contrib/localflavor/at/at_states.py:9
+msgid "Salzburg"
+msgstr "Salzburg"
+
+#: contrib/localflavor/at/at_states.py:10
+msgid "Styria"
+msgstr "Styria"
+
+#: contrib/localflavor/at/at_states.py:11
+msgid "Tyrol"
+msgstr "Tyrol"
+
+#: contrib/localflavor/at/at_states.py:12
+msgid "Vorarlberg"
+msgstr "Vorarlberg"
+
+#: contrib/localflavor/at/at_states.py:13
+msgid "Vienna"
+msgstr "Wiedeń"
+
+#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16
+#: contrib/localflavor/no/forms.py:12
+msgid "Enter a zip code in the format XXXX."
+msgstr "Wpisz kod pocztowy w formacie XXXX."
+
+#: contrib/localflavor/at/forms.py:48
+msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
+msgstr ""
+"Wpisz poprawny numer austriackiego ubezpieczenia w formacie XXXX XXXXXX."
+
#: contrib/localflavor/au/forms.py:16
msgid "Enter a 4 digit post code."
msgstr "Wpisz czterocyfrowy kod pocztowy."
@@ -1884,10 +1964,6 @@ msgstr "Zug"
msgid "Zurich"
msgstr "Zurych"
-#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12
-msgid "Enter a zip code in the format XXXX."
-msgstr "Wpisz kod pocztowy w formacie XXXX."
-
#: contrib/localflavor/ch/forms.py:64
msgid ""
"Enter a valid Swiss identity or passport card number in X1234567<0 or "
@@ -2808,6 +2884,26 @@ msgstr "Wielkopolskie"
msgid "West Pomerania"
msgstr "Zachodniopomorskie"
+#: contrib/localflavor/ro/forms.py:19
+msgid "Enter a valid CIF."
+msgstr "Wpisz poprawny CIF."
+
+#: contrib/localflavor/ro/forms.py:56
+msgid "Enter a valid CNP."
+msgstr "Wpisz poprawny CNP."
+
+#: contrib/localflavor/ro/forms.py:141
+msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
+msgstr "Podaj poprawny IBAN w formacie ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
+
+#: contrib/localflavor/ro/forms.py:171
+msgid "Phone numbers must be in XXXX-XXXXXX format."
+msgstr "Numery telefoniczne muszą być w formacie XXXX-XXXXXX."
+
+#: contrib/localflavor/ro/forms.py:194
+msgid "Enter a valid postal code in the format XXXXXX"
+msgstr "Wpisz kod pocztowy w formacie XXXXXX."
+
#: contrib/localflavor/sk/forms.py:30
msgid "Enter a postal code in the format XXXXX or XXX XX."
msgstr "Wpisz kod pocztowy w formacie XXXXX or XXX XX."
@@ -3552,18 +3648,14 @@ msgstr "nazwa domeny"
msgid "display name"
msgstr "wyświetlana nazwa"
-#: contrib/sites/models.py:37
+#: contrib/sites/models.py:38
msgid "site"
msgstr "strona"
-#: contrib/sites/models.py:38
+#: contrib/sites/models.py:39
msgid "sites"
msgstr "strony"
-#: core/validators.py:72
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "To pole może zawierać tylko litery, cyfry i podkreślenia."
-
#: core/validators.py:76
msgid ""
"This value must contain only letters, numbers, underscores, dashes or "
@@ -3608,7 +3700,7 @@ msgstr "Tu mogą być tylko cyfry."
msgid "This value can't be comprised solely of digits."
msgstr "To pole nie może zawierać jedynie cyfr."
-#: core/validators.py:128 newforms/fields.py:152
+#: core/validators.py:128 forms/fields.py:158
msgid "Enter a whole number."
msgstr "Wpisz liczbę całkowitą."
@@ -3617,36 +3709,31 @@ msgid "Only alphabetical characters are allowed here."
msgstr "Tutaj są dozwolone tylko litery."
#: core/validators.py:147
-msgid "Year must be 1900 or later."
-msgstr "Rok nie może być wcześniejszy niż 1900."
-
-#: core/validators.py:151
#, python-format
msgid "Invalid date: %s"
msgstr "Niepoprawna data: %s"
-#: core/validators.py:156 db/models/fields/__init__.py:548
+#: core/validators.py:152 db/models/fields/__init__.py:559
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Proszę wpisać poprawną datę w formacie RRRR-MM-DD."
-#: core/validators.py:161
+#: core/validators.py:157
msgid "Enter a valid time in HH:MM format."
msgstr "Proszę wpisać poprawną godzinę w formacie HH:MM."
-#: core/validators.py:165 db/models/fields/__init__.py:625
+#: core/validators.py:161 db/models/fields/__init__.py:640
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Wprowadź poprawną datę i godzinę w formacie RRRR-MM-DD GG:MM."
-#: core/validators.py:170 newforms/fields.py:403
+#: core/validators.py:166 forms/fields.py:409
msgid "Enter a valid e-mail address."
msgstr "Wprowadź poprawny adres e-mail."
-#: core/validators.py:182 core/validators.py:474 newforms/fields.py:433
-#: oldforms/__init__.py:687
+#: core/validators.py:178 core/validators.py:470 forms/fields.py:427
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Nie wysłano żadnego pliku. Sprawdź typ kodowania formularza."
-#: core/validators.py:193 newforms/fields.py:459
+#: core/validators.py:189 forms/fields.py:467
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -3654,28 +3741,28 @@ msgstr ""
"Wgraj poprawny plik graficzny. Ten, który został wgrany, nie jest obrazem, "
"albo jest uszkodzony."
-#: core/validators.py:200
+#: core/validators.py:196
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "Odnośnik %s nie wskazuje na poprawny plik z obrazem."
-#: core/validators.py:204
+#: core/validators.py:200
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
msgstr ""
"Numery telefoniczne muszą być w formacie XXX-XXX-XXXX. \"%s\" jest "
"niepoprawny."
-#: core/validators.py:212
+#: core/validators.py:208
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "Odnośnik %s nie wskazuje na poprawne nagranie QuickTime video."
-#: core/validators.py:216
+#: core/validators.py:212
msgid "A valid URL is required."
msgstr "Wymagany jest poprawny URL."
-#: core/validators.py:230
+#: core/validators.py:226
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
@@ -3684,26 +3771,26 @@ msgstr ""
"Wymagany jest poprawny HTML. Błędy, które wystąpiły:\n"
"%s"
-#: core/validators.py:237
+#: core/validators.py:233
#, python-format
msgid "Badly formed XML: %s"
msgstr "Nieprawidłowy format XML: %s"
-#: core/validators.py:254
+#: core/validators.py:250
#, python-format
msgid "Invalid URL: %s"
msgstr "Niepoprawny odnośnik: %s"
-#: core/validators.py:259 core/validators.py:261
+#: core/validators.py:255 core/validators.py:257
#, python-format
msgid "The URL %s is a broken link."
msgstr "Odnośnik %s jest nieprawidłowy."
-#: core/validators.py:267
+#: core/validators.py:263
msgid "Enter a valid U.S. state abbreviation."
msgstr "Wpisz poprawny kod stanu U.S.A."
-#: core/validators.py:281
+#: core/validators.py:277
#, 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."
@@ -3711,59 +3798,59 @@ msgstr[0] "Nie wolno przeklinać! Słowo %s nie jest dozwolone."
msgstr[1] "Nie wolno przeklinać! Słowa %s nie są dozwolone."
msgstr[2] "Nie wolno przeklinać! Słowa %s nie są dozwolone."
-#: core/validators.py:288
+#: core/validators.py:284
#, python-format
msgid "This field must match the '%s' field."
msgstr "To pole musi pasować do pola '%s'."
-#: core/validators.py:307
+#: core/validators.py:303
msgid "Please enter something for at least one field."
msgstr "Proszę uzupełnić przynajmniej jedno pole."
-#: core/validators.py:316 core/validators.py:327
+#: core/validators.py:312 core/validators.py:323
msgid "Please enter both fields or leave them both empty."
msgstr "Proszę uzupełnić oba pola lub zostawić je puste."
-#: core/validators.py:335
+#: core/validators.py:331
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "To pole musi być uzupełnione, jeśli %(field)s ma wartość %(value)s"
-#: core/validators.py:348
+#: core/validators.py:344
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr ""
"To pole musi być uzupełnione, jeśli %(field)s ma wartość inną niż %(value)s"
-#: core/validators.py:367
+#: core/validators.py:363
msgid "Duplicate values are not allowed."
msgstr "Duplikaty nie są dozwolone."
-#: core/validators.py:382
+#: core/validators.py:378
#, python-format
msgid "This value must be between %(lower)s and %(upper)s."
msgstr "Ta wartość musi być pomiędzy %(lower)s a %(upper)s."
-#: core/validators.py:384
+#: core/validators.py:380
#, python-format
msgid "This value must be at least %s."
msgstr "Ta wartość nie może być mniejsza od %s."
-#: core/validators.py:386
+#: core/validators.py:382
#, python-format
msgid "This value must be no more than %s."
msgstr "Ta wartość nie może być większa od %s."
-#: core/validators.py:427
+#: core/validators.py:423
#, python-format
msgid "This value must be a power of %s."
msgstr "Ta wartość musi być potęgą %s."
-#: core/validators.py:437
+#: core/validators.py:433
msgid "Please enter a valid decimal number."
msgstr "Proszę wpisać poprawną liczbę dziesiętną."
-#: core/validators.py:444
+#: core/validators.py:440
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
msgid_plural ""
@@ -3775,7 +3862,7 @@ msgstr[1] ""
msgstr[2] ""
"Proszę wpisać poprawną liczbę dziesiętną o nie więcej niż %s cyfrach."
-#: core/validators.py:447
+#: core/validators.py:443
#, python-format
msgid ""
"Please enter a valid decimal number with a whole part of at most %s digit."
@@ -3788,7 +3875,7 @@ msgstr[1] ""
msgstr[2] ""
"Proszę wpisać poprawną liczbę dziesiętną zawierającą nie więcej niż %s cyfr."
-#: core/validators.py:450
+#: core/validators.py:446
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural ""
@@ -3803,41 +3890,41 @@ msgstr[2] ""
"Proszę wpisać poprawną liczbę dziesiętną z dokładnością do %s miejsc po "
"przecinku."
-#: core/validators.py:458
+#: core/validators.py:454
msgid "Please enter a valid floating point number."
msgstr "Proszę wpisać poprawną liczbę rzeczywistą."
-#: core/validators.py:467
+#: core/validators.py:463
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "Upewnij się, że wgrany plik ma conajmniej %s bajtów."
-#: core/validators.py:468
+#: core/validators.py:464
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "Upewnij się, że wgrany plik ma co najwyżej %s bajtów."
-#: core/validators.py:485
+#: core/validators.py:481
msgid "The format for this field is wrong."
msgstr "Format tego pola jest nieprawidłowy."
-#: core/validators.py:500
+#: core/validators.py:496
msgid "This field is invalid."
msgstr "To pole jest nieprawidłowe."
-#: core/validators.py:536
+#: core/validators.py:532
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "Nie można nic pobrać z %s."
-#: core/validators.py:539
+#: core/validators.py:535
#, python-format
msgid ""
"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
msgstr ""
"URL %(url)s zwrócił niepoprawny nagłówek Content-Type '%(contenttype)s'."
-#: core/validators.py:572
+#: core/validators.py:568
#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -3846,7 +3933,7 @@ msgstr ""
"Proszę zamknąć tag %(tag)s z linii %(line)s. (Linia zaczyna się od \"%(start)"
"s\".)"
-#: core/validators.py:576
+#: core/validators.py:572
#, python-format
msgid ""
"Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -3855,7 +3942,7 @@ msgstr ""
"Część tekstu od linii %(line)s nie jest dozwolony w tym kontekście. (Linia "
"zaczyna się od \"%(start)s\".)"
-#: core/validators.py:581
+#: core/validators.py:577
#, python-format
msgid ""
"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -3864,7 +3951,7 @@ msgstr ""
"\"%(attr)s\" w linii %(line)s jest niepoprawnym atrybutem. (Linia zaczyna "
"się od \"%(start)s\".)"
-#: core/validators.py:586
+#: core/validators.py:582
#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -3873,7 +3960,7 @@ msgstr ""
"\"<%(tag)s>\" w linii %(line)s nie jest poprawnym tagiem. (Linia zaczyna się "
"od \"%(start)s\".)"
-#: core/validators.py:590
+#: core/validators.py:586
#, python-format
msgid ""
"A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -3882,7 +3969,7 @@ msgstr ""
"Tag w linii %(line)s nie posiada jednego lub więcej wymaganych atrybutów. "
"(Linia zaczyna się od \"%(start)s\".)"
-#: core/validators.py:595
+#: core/validators.py:591
#, python-format
msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -3891,65 +3978,61 @@ msgstr ""
"Atrybut \"%(attr)s\" w linii %(line)s ma niepoprawną wartość. (Linia zaczyna "
"się od \"%(start)s\".)"
-#: db/models/manipulators.py:308
+#: db/models/manipulators.py:304
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "%(object)s z %(type)s już istnieje dla %(field)s."
-#: db/models/fields/__init__.py:51
+#: db/models/fields/__init__.py:47
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "Już istnieje %(optname)s z %(fieldname)s."
-#: db/models/fields/__init__.py:176 db/models/fields/__init__.py:348
-#: db/models/fields/__init__.py:780 db/models/fields/__init__.py:791
-#: newforms/fields.py:46 oldforms/__init__.py:374
+#: db/models/fields/__init__.py:175 db/models/fields/__init__.py:343
+#: db/models/fields/__init__.py:802 db/models/fields/__init__.py:813
+#: forms/fields.py:52 oldforms/__init__.py:374
msgid "This field is required."
msgstr "To pole jest wymagane."
-#: db/models/fields/__init__.py:448
+#: db/models/fields/__init__.py:457
msgid "This value must be an integer."
msgstr "Ta wartość musi być liczbą całkowitą."
-#: db/models/fields/__init__.py:487
+#: db/models/fields/__init__.py:498
msgid "This value must be either True or False."
msgstr ""
"Ta wartość musi być wartością logiczną (True, False - prawda lub fałsz)."
-#: db/models/fields/__init__.py:511
+#: db/models/fields/__init__.py:522
msgid "This field cannot be null."
msgstr "To pole nie może być puste."
-#: db/models/fields/__init__.py:689
+#: db/models/fields/__init__.py:709
msgid "This value must be a decimal number."
msgstr "Ta wartość musi być liczbą dziesiętną."
-#: db/models/fields/__init__.py:800
+#: db/models/fields/__init__.py:822
msgid "Enter a valid filename."
msgstr "Wpisz poprawną nazwę pliku."
-#: db/models/fields/__init__.py:981
+#: db/models/fields/__init__.py:1013
msgid "This value must be either None, True or False."
msgstr ""
"Ta wartość musi być jedną z None (nic), True (prawda) lub False (fałsz)."
-#: db/models/fields/related.py:94
+#: db/models/fields/related.py:93
#, python-format
msgid "Please enter a valid %s."
msgstr "Proszę wpisać poprawne %s."
-#: db/models/fields/related.py:746
-msgid "Separate multiple IDs with commas."
-msgstr "Oddziel identyfikatory przecinkami."
-
-#: db/models/fields/related.py:748
+#: db/models/fields/related.py:729
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Przytrzymaj wciśnięty klawisz \"Ctrl\" lub \"Command\" na Mac'u aby "
"zaznaczyć więcej niż jeden wybór."
-#: db/models/fields/related.py:795
+#: db/models/fields/related.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -3964,100 +4047,100 @@ msgstr[2] ""
"Proszę podać poprawne identyfikatory %(self)s. Wartości %(value)r są "
"niepoprawne."
-#: newforms/fields.py:47
+#: forms/fields.py:53
msgid "Enter a valid value."
msgstr "Wpisz poprawną wartość."
-#: newforms/fields.py:124
+#: forms/fields.py:130
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Upewnij się, że ta wartość ma co najwyżej %(max)d znaków (ma długość %"
"(length)d)."
-#: newforms/fields.py:125
+#: forms/fields.py:131
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Upewnij się, że ta wartość ma co najmniej %(min)d znaków (ma długość %"
"(length)d)."
-#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211
+#: forms/fields.py:159 forms/fields.py:188 forms/fields.py:217
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Upewnij się, że ta wartość jest mniejsza lub równa %s."
-#: newforms/fields.py:154 newforms/fields.py:183 newforms/fields.py:212
+#: forms/fields.py:160 forms/fields.py:189 forms/fields.py:218
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Upewnij się, że ta wartość jest większa lub równa %s."
-#: newforms/fields.py:181 newforms/fields.py:210
+#: forms/fields.py:187 forms/fields.py:216
msgid "Enter a number."
msgstr "Wpisz liczbę."
-#: newforms/fields.py:213
+#: forms/fields.py:219
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Upewnij się, że jest nie więcej niż %s cyfr."
-#: newforms/fields.py:214
+#: forms/fields.py:220
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Upewnij się, że jest nie więcej niż %s miejsc po przecinku."
-#: newforms/fields.py:215
+#: forms/fields.py:221
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Upewnij się, że jest nie więcej niż %s miejsc przed przecinkiem."
-#: newforms/fields.py:263 newforms/fields.py:750
+#: forms/fields.py:269 forms/fields.py:799
msgid "Enter a valid date."
msgstr "Wpisz poprawną datę."
-#: newforms/fields.py:296 newforms/fields.py:751
+#: forms/fields.py:302 forms/fields.py:800
msgid "Enter a valid time."
msgstr "Wpisz poprawną godzinę."
-#: newforms/fields.py:335
+#: forms/fields.py:341
msgid "Enter a valid date/time."
msgstr "Wpisz poprawną datę/godzinę."
-#: newforms/fields.py:434
+#: forms/fields.py:428
msgid "No file was submitted."
msgstr "Żaden plik nie został przesłany."
-#: newforms/fields.py:435 oldforms/__init__.py:689
+#: forms/fields.py:429 oldforms/__init__.py:693
msgid "The submitted file is empty."
msgstr "Wysłany plik jest pusty."
-#: newforms/fields.py:497
+#: forms/fields.py:528
msgid "Enter a valid URL."
msgstr "Wpisz poprawny URL."
-#: newforms/fields.py:498
+#: forms/fields.py:529
msgid "This URL appears to be a broken link."
msgstr "Ten odnośnik jest nieprawidłowy."
-#: newforms/fields.py:559 newforms/models.py:305
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Wybierz poprawną wartość. Podana nie jest jednym z dostępnych wyborów."
-
-#: newforms/fields.py:598
+#: forms/fields.py:597 forms/fields.py:648
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Wybierz poprawną wartość. %(value)s nie jest jednym z dostępnych wyborów."
-#: newforms/fields.py:599 newforms/fields.py:661 newforms/models.py:372
+#: forms/fields.py:649 forms/fields.py:710 forms/models.py:581
msgid "Enter a list of values."
msgstr "Podaj listę wartości."
-#: newforms/fields.py:779
+#: forms/fields.py:828
msgid "Enter a valid IPv4 address."
msgstr "Wprowadź poprawny adres IPv4."
-#: newforms/models.py:373
+#: forms/models.py:514
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Wybierz poprawną wartość. Podana nie jest jednym z dostępnych wyborów."
+
+#: forms/models.py:582
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Wybierz poprawną wartość. %s nie jest jednym z dostępnych wyborów."
@@ -4079,15 +4162,15 @@ msgstr "Znaki nowej linii są tutaj niedopuszczalne."
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Wybierz poprawną opcję; '%(data)s' nie jest wśród %(choices)s."
-#: oldforms/__init__.py:745
+#: oldforms/__init__.py:754
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Proszę wpisać liczbę całkowitą z zakresu od -32 768 do 32 767"
-#: oldforms/__init__.py:755
+#: oldforms/__init__.py:764
msgid "Enter a positive number."
msgstr "Proszę wpisać liczbę dodatnią."
-#: oldforms/__init__.py:765
+#: oldforms/__init__.py:774
msgid "Enter a whole number between 0 and 32,767."
msgstr "Proszę wpisać liczbę całkowitą z zakresu od 0 do 32 767"
@@ -4322,7 +4405,7 @@ msgstr "Lis."
msgid "Dec."
msgstr "Gru."
-#: utils/text.py:127
+#: utils/text.py:128
msgid "or"
msgstr "lub"
@@ -4382,41 +4465,62 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:403
+#: utils/translation/trans_real.py:401
msgid "DATE_FORMAT"
msgstr "Y-m-d"
-#: utils/translation/trans_real.py:404
+#: utils/translation/trans_real.py:402
msgid "DATETIME_FORMAT"
msgstr "Y-m-d H:i:s"
-#: utils/translation/trans_real.py:405
+#: utils/translation/trans_real.py:403
msgid "TIME_FORMAT"
msgstr "H:i:s"
-#: utils/translation/trans_real.py:421
+#: utils/translation/trans_real.py:419
msgid "YEAR_MONTH_FORMAT"
msgstr "Y-m"
-#: utils/translation/trans_real.py:422
+#: utils/translation/trans_real.py:420
msgid "MONTH_DAY_FORMAT"
msgstr "m-d"
-#: views/generic/create_update.py:43
+#: views/generic/create_update.py:129
#, python-format
msgid "The %(verbose_name)s was created successfully."
msgstr "%(verbose_name)s zostało pomyślnie utworzone."
-#: views/generic/create_update.py:117
+#: views/generic/create_update.py:172
#, python-format
msgid "The %(verbose_name)s was updated successfully."
msgstr "%(verbose_name)s zostało pomyślnie zmienione."
-#: views/generic/create_update.py:184
+#: views/generic/create_update.py:214
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s zostało usunięte."
+#~ msgid "Ordering"
+#~ msgstr "Sortowanie"
+
+#~ msgid "Order:"
+#~ msgstr "Porządek:"
+
+#~ msgid "Added %s."
+#~ msgstr "Dodano %s"
+
+#~ msgid "Deleted %s."
+#~ msgstr "Skasowano %s"
+
+#~ msgid "The two 'new password' fields didn't match."
+#~ msgstr "Pola 'nowe hasło' nie zgadzają się."
+
+#~ msgid "Year must be 1900 or later."
+#~ msgstr "Rok nie może być wcześniejszy niż 1900."
+
+#~ msgid "Separate multiple IDs with commas."
+#~ msgstr "Oddziel identyfikatory przecinkami."
+
#~ msgid "Brazilian"
#~ msgstr "Brazylijski"
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 921eef2230..f254e69e97 100644
Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index 264b233bc5..5f4555a5d1 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -1358,7 +1358,7 @@ msgstr "aprovado pela equipe"
#: contrib/comments/models.py:187
msgid "free comment"
-msgstr "fomentário livre"
+msgstr "comentário livre"
#: contrib/comments/models.py:188
msgid "free comments"
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 08ed5b16e5..89e36aad09 100644
Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index 4053068d9b..b89345285e 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,1651 +2,3757 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:11+0200\n"
-"PO-Revision-Date: 2007-02-20 18:50+0100\n"
-"Last-Translator: Petar Marić \n"
-"Language-Team: Nesh & Petar \n"
+"POT-Creation-Date: 2008-07-29 12:06+0200\n"
+"PO-Revision-Date: 2008-07-29 12:52+0100\n"
+"Last-Translator: Nebojsa Djordjevic \n"
+"Language-Team: Nesh & Petar \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Poedit-Country: YUGOSLAVIA\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: ../../../../\n"
+"X-Poedit-Language: Serbian\n"
-#: contrib/comments/models.py:67
-#: contrib/comments/models.py:166
+#: conf/global_settings.py:44
+msgid "Arabic"
+msgstr "Arapski"
+
+#: conf/global_settings.py:45
+msgid "Bengali"
+msgstr "Bengalski"
+
+#: conf/global_settings.py:46
+msgid "Bulgarian"
+msgstr "Bugarski"
+
+#: conf/global_settings.py:47
+#, fuzzy
+msgid "Catalan"
+msgstr "Italijanski"
+
+#: conf/global_settings.py:48
+msgid "Czech"
+msgstr "Češki"
+
+#: conf/global_settings.py:49
+msgid "Welsh"
+msgstr "Welšski"
+
+#: conf/global_settings.py:50
+msgid "Danish"
+msgstr "Danski"
+
+#: conf/global_settings.py:51
+msgid "German"
+msgstr "Nemački"
+
+#: conf/global_settings.py:52
+msgid "Greek"
+msgstr "Grčki"
+
+#: conf/global_settings.py:53
+msgid "English"
+msgstr "Engleski"
+
+#: conf/global_settings.py:54
+msgid "Spanish"
+msgstr "Španski"
+
+#: conf/global_settings.py:55
+#, fuzzy
+msgid "Estonian"
+msgstr "Rumunski"
+
+#: conf/global_settings.py:56
+msgid "Argentinean Spanish"
+msgstr "Španski (Argentina)"
+
+#: conf/global_settings.py:57
+msgid "Basque"
+msgstr "Baskijski"
+
+#: conf/global_settings.py:58
+msgid "Persian"
+msgstr "Persijski"
+
+#: conf/global_settings.py:59
+msgid "Finnish"
+msgstr "Finski"
+
+#: conf/global_settings.py:60
+msgid "French"
+msgstr "Francuski"
+
+#: conf/global_settings.py:61
+msgid "Irish"
+msgstr "Irski"
+
+#: conf/global_settings.py:62
+msgid "Galician"
+msgstr "Galski"
+
+#: conf/global_settings.py:63
+msgid "Hungarian"
+msgstr "Mađarski"
+
+#: conf/global_settings.py:64
+msgid "Hebrew"
+msgstr "Hebrejski"
+
+#: conf/global_settings.py:65
+msgid "Croatian"
+msgstr "Hrvatski"
+
+#: conf/global_settings.py:66
+msgid "Icelandic"
+msgstr "Islandski"
+
+#: conf/global_settings.py:67
+msgid "Italian"
+msgstr "Italijanski"
+
+#: conf/global_settings.py:68
+msgid "Japanese"
+msgstr "Japanski"
+
+#: conf/global_settings.py:69
+#, fuzzy
+msgid "Georgian"
+msgstr "Nemački"
+
+#: conf/global_settings.py:70
+#, fuzzy
+msgid "Korean"
+msgstr "Norveški"
+
+#: conf/global_settings.py:71
+msgid "Khmer"
+msgstr "Kmerski"
+
+# wtf?
+#: conf/global_settings.py:72
+#, fuzzy
+msgid "Kannada"
+msgstr ""
+
+#: conf/global_settings.py:73
+msgid "Latvian"
+msgstr "Latvijski"
+
+#: conf/global_settings.py:74
+msgid "Lithuanian"
+msgstr "Litvanijski"
+
+#: conf/global_settings.py:75
+msgid "Macedonian"
+msgstr "Makedonski"
+
+#: conf/global_settings.py:76
+msgid "Dutch"
+msgstr "Holandski"
+
+#: conf/global_settings.py:77
+msgid "Norwegian"
+msgstr "Norveški"
+
+#: conf/global_settings.py:78
+msgid "Polish"
+msgstr "Poljski"
+
+#: conf/global_settings.py:79
+msgid "Portugese"
+msgstr "Portugalski"
+
+#: conf/global_settings.py:80
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Brazilski"
+
+#: conf/global_settings.py:81
+msgid "Romanian"
+msgstr "Rumunski"
+
+#: conf/global_settings.py:82
+msgid "Russian"
+msgstr "Ruski"
+
+#: conf/global_settings.py:83
+msgid "Slovak"
+msgstr "Slovački"
+
+#: conf/global_settings.py:84
+msgid "Slovenian"
+msgstr "Slovenački"
+
+#: conf/global_settings.py:85
+msgid "Serbian"
+msgstr "Srpski"
+
+#: conf/global_settings.py:86
+msgid "Swedish"
+msgstr "Švedski"
+
+#: conf/global_settings.py:87
+#, fuzzy
+msgid "Tamil"
+msgstr ""
+
+#: conf/global_settings.py:88
+#, fuzzy
+msgid "Telugu"
+msgstr ""
+
+#: conf/global_settings.py:89
+msgid "Turkish"
+msgstr "Turski"
+
+#: conf/global_settings.py:90
+msgid "Ukrainian"
+msgstr "Ukrajinski"
+
+#: conf/global_settings.py:91
+msgid "Simplified Chinese"
+msgstr "Kineski (pojednostavljen)"
+
+#: conf/global_settings.py:92
+msgid "Traditional Chinese"
+msgstr "Tradicionalni Kineski"
+
+#: contrib/admin/filterspecs.py:44
+#, python-format
+msgid ""
+"
By %s:
\n"
+"
\n"
+msgstr ""
+"
Po %s:
\n"
+"
\n"
+
+#: contrib/admin/filterspecs.py:74
+#: contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147
+#: contrib/admin/filterspecs.py:173
+msgid "All"
+msgstr "Sve"
+
+#: contrib/admin/filterspecs.py:113
+msgid "Any date"
+msgstr "Bilo koji datum"
+
+#: contrib/admin/filterspecs.py:114
+msgid "Today"
+msgstr "Danas"
+
+#: contrib/admin/filterspecs.py:117
+msgid "Past 7 days"
+msgstr "U zadnjih 7 dana"
+
+#: contrib/admin/filterspecs.py:119
+msgid "This month"
+msgstr "Ovoga meseca"
+
+#: contrib/admin/filterspecs.py:121
+msgid "This year"
+msgstr "Ove godine"
+
+#: contrib/admin/filterspecs.py:147
+#: forms/widgets.py:379
+#: oldforms/__init__.py:592
+msgid "Yes"
+msgstr "Da"
+
+#: contrib/admin/filterspecs.py:147
+#: forms/widgets.py:379
+#: oldforms/__init__.py:592
+msgid "No"
+msgstr "Ne"
+
+#: contrib/admin/filterspecs.py:154
+#: forms/widgets.py:379
+#: oldforms/__init__.py:592
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: contrib/admin/models.py:19
+msgid "action time"
+msgstr "vreme aktivnosti"
+
+#: contrib/admin/models.py:22
+msgid "object id"
+msgstr "id objekta"
+
+#: contrib/admin/models.py:23
+msgid "object repr"
+msgstr "opis objekta"
+
+#: contrib/admin/models.py:24
+msgid "action flag"
+msgstr "oznaka aktivnosti"
+
+#: contrib/admin/models.py:25
+msgid "change message"
+msgstr "opis izmene"
+
+#: contrib/admin/models.py:28
+msgid "log entry"
+msgstr "unos u dnevniku izmena"
+
+#: contrib/admin/models.py:29
+msgid "log entries"
+msgstr "unosi u dnevniku izmena"
+
+#: contrib/admin/options.py:161
+#: contrib/admin/options.py:180
+msgid "None"
+msgstr "None"
+
+#: contrib/admin/options.py:347
+#: contrib/auth/admin.py:37
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Uspešno dodat %(name)s \"%(obj)s\"."
+
+#: contrib/admin/options.py:351
+#: contrib/admin/options.py:419
+#: contrib/auth/admin.py:42
+msgid "You may edit it again below."
+msgstr "Možete ga ponovo izmeniti."
+
+#: contrib/admin/options.py:361
+#: contrib/admin/options.py:428
+#, python-format
+msgid "You may add another %s below."
+msgstr "Možete dodati još jedan %s."
+
+#: contrib/admin/options.py:395
+#, python-format
+msgid "Changed %s."
+msgstr "Izmenjen %s."
+
+#: contrib/admin/options.py:395
+#: contrib/admin/options.py:405
+#: core/validators.py:279
+#: db/models/manipulators.py:305
+msgid "and"
+msgstr "i"
+
+#: contrib/admin/options.py:400
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "Dodato %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:404
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "Promenjeno %(list)s za %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:409
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "Obrisano %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:414
+msgid "No fields changed."
+msgstr "Nijedno polje nije izmenjeno."
+
+#: contrib/admin/options.py:417
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Uspešno izmenjen: %(name)s \"%(obj)s\"."
+
+#: contrib/admin/options.py:425
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" je uspešno dodat. Možete ga ponovo izmeniti."
+
+#: contrib/admin/options.py:506
+#, python-format
+msgid "Add %s"
+msgstr "Dodajte %s"
+
+#: contrib/admin/options.py:568
+#, python-format
+msgid "Change %s"
+msgstr "Izmeni %s"
+
+#: contrib/admin/options.py:598
+msgid "Database error"
+msgstr "Greška u bazi podataka"
+
+#: contrib/admin/options.py:647
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Uspešno obrisan: %(name)s \"%(obj)s\"."
+
+#: contrib/admin/options.py:653
+msgid "Are you sure?"
+msgstr "Da li ste sigurni?"
+
+#: contrib/admin/options.py:680
+#, python-format
+msgid "Change history: %s"
+msgstr "Istorija izmena: %s"
+
+#: contrib/admin/sites.py:18
+#: contrib/admin/views/decorators.py:16
+#: contrib/auth/forms.py:70
+#: contrib/comments/views/comments.py:56
+msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
+msgstr "Unesite ispravno korisničko ime i šifru. Napomena: oba polja prave razliku između velikih i malih slova."
+
+#: contrib/admin/sites.py:233
+#: contrib/admin/views/decorators.py:68
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgstr "Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su sačuvani."
+
+#: contrib/admin/sites.py:240
+#: contrib/admin/views/decorators.py:75
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
+msgstr "Vaš internet čitač nije prihvatio \"cookie\". Nakon aktiviranja odgovarajuće opcije ponovo učitajte stranu."
+
+#: contrib/admin/sites.py:254
+#: contrib/admin/sites.py:260
+#: contrib/admin/views/decorators.py:92
+msgid "Usernames cannot contain the '@' character."
+msgstr "Korisnička imena ne mogu sadržati karakter '@'."
+
+#: contrib/admin/sites.py:257
+#: contrib/admin/views/decorators.py:88
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Vaše korisničko ime nije data e-mail adresa. Pokušajte sa '%s'."
+
+#: contrib/admin/sites.py:325
+msgid "Site administration"
+msgstr "Administracija sajta"
+
+#: contrib/admin/sites.py:347
+#: contrib/admin/templates/admin/login.html:27
+#: contrib/admin/views/decorators.py:30
+msgid "Log in"
+msgstr "Prijavite se"
+
+#: contrib/admin/util.py:126
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Jedno ili više %(fieldname)s u %(name)s: %(obj)s"
+
+#: contrib/admin/util.py:131
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Jedan ili više %(fieldname)s u %(name)s:"
+
+#: contrib/admin/widgets.py:65
+msgid "Date:"
+msgstr "Datum:"
+
+#: contrib/admin/widgets.py:65
+msgid "Time:"
+msgstr "Vreme:"
+
+#: contrib/admin/widgets.py:89
+msgid "Currently:"
+msgstr "Trenutno:"
+
+#: contrib/admin/widgets.py:89
+msgid "Change:"
+msgstr "Izmenite:"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Strana nije pronađena"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Tražena strana ne postoji."
+
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/invalid_setup.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+msgid "Home"
+msgstr "Početna strana"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Greška na serveru"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Greška na serveru (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error (500)"
+msgstr "Greška na serveru (500)"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
+msgstr "Dogodila se greška koja je prijavljena administratorima."
+
+#: contrib/admin/templates/admin/base.html:25
+msgid "Welcome,"
+msgstr "Dobrodošli,"
+
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:13
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+msgid "Change password"
+msgstr "Izmenite lozinku"
+
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/comments/templates/comments/form.html:6
+msgid "Log out"
+msgstr "Odjavite se"
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django administracija sajta"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django administracija"
+
+#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/index.html:29
+msgid "Add"
+msgstr "Dodajte"
+
+#: contrib/admin/templates/admin/change_form.html:26
+#: contrib/admin/templates/admin/object_history.html:5
+msgid "History"
+msgstr "Istorija"
+
+#: contrib/admin/templates/admin/change_form.html:27
+msgid "View on site"
+msgstr "Pogledaj na sajtu"
+
+#: contrib/admin/templates/admin/change_form.html:37
+#: contrib/admin/templates/admin/auth/user/change_password.html:22
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Ispravite dole navedenu grešku."
+msgstr[1] "Ispravite dole navedene greške."
+msgstr[2] "Ispravite dole navedene greške."
+
+#: contrib/admin/templates/admin/change_list.html:16
+#, python-format
+msgid "Add %(name)s"
+msgstr "Dodajte %(name)s"
+
+#: contrib/admin/templates/admin/change_list.html:26
+msgid "Filter"
+msgstr "Filter"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:9
+#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
+msgid "Delete"
+msgstr "Obrišite"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:15
+#, 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 "Brisanjem %(object_name)s '%(escaped_object)s' došlo bi do brisanja pridruženih objekata, ali nemate prava da brišete sledeće objekte:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:22
+#, python-format
+msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
+msgstr "Da li ste sigurni da želite da obrišete %(object_name)s \"%(escaped_object)s\"? Takođe će biti obrisani sledeći pridruženi objekti:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:27
+msgid "Yes, I'm sure"
+msgstr "Da, siguran sam"
+
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Po %(filter_title)s"
+
+#: contrib/admin/templates/admin/index.html:18
+#, python-format
+msgid "Models available in the %(name)s application."
+msgstr "Dostupni modeli u aplikaciji %(name)s."
+
+#: contrib/admin/templates/admin/index.html:19
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
+
+#: contrib/admin/templates/admin/index.html:35
+msgid "Change"
+msgstr "Izmenite"
+
+#: contrib/admin/templates/admin/index.html:45
+msgid "You don't have permission to edit anything."
+msgstr "Nemate prava da vršite izmene."
+
+#: contrib/admin/templates/admin/index.html:53
+msgid "Recent Actions"
+msgstr "Poslednje aktivnosti"
+
+#: contrib/admin/templates/admin/index.html:54
+msgid "My Actions"
+msgstr "Moje aktivnosti"
+
+#: contrib/admin/templates/admin/index.html:58
+msgid "None available"
+msgstr "Bez aktivnosti"
+
+#: 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 "Nešto nije u redu sa vašom istalacijom baze podataka. Proverite da li su sve tabele kreirane i čitljive od strane definisanog korisnika."
+
+#: contrib/admin/templates/admin/login.html:19
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+msgid "Username:"
+msgstr "Korisničko ime:"
+
+#: contrib/admin/templates/admin/login.html:22
+#: contrib/comments/templates/comments/form.html:8
+msgid "Password:"
+msgstr "Lozinka:"
+
+#: contrib/admin/templates/admin/object_history.html:16
+msgid "Date/time"
+msgstr "Datum/vreme"
+
+#: contrib/admin/templates/admin/object_history.html:17
+msgid "User"
+msgstr "Korisnik"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Action"
+msgstr "Aktivnost"
+
+#: contrib/admin/templates/admin/object_history.html:24
+msgid "DATE_WITH_TIME_FULL"
+msgstr "j. N Y, H:i"
+
+#: contrib/admin/templates/admin/object_history.html:32
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
+msgstr "Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem administracije sajta."
+
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Prikaži sve"
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "Nađi"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "1 result"
+msgid_plural "%(counter)s results"
+msgstr[0] "1 rezultat"
+msgstr[1] "%(counter)s rezultata"
+msgstr[2] "%(counter)s rezultata"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "%(full_result_count)s ukupno"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Snimite kao novi"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Snimite i dodaj još jedan"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Snimite i nastavite sa izmenama"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Snimite"
+
+#: 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."
+msgstr "Prvo unesite korisničko ime i lozinku da bi ste mogli menjati ostale opcije za korisnika."
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:13
+#: contrib/auth/forms.py:12
+#: contrib/auth/forms.py:49
+msgid "Username"
+msgstr "Korisničko ime"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:20
+#: contrib/admin/templates/admin/auth/user/change_password.html:33
+#: contrib/auth/forms.py:15
+#: contrib/auth/forms.py:50
+#: contrib/auth/forms.py:166
+msgid "Password"
+msgstr "Lozinka"
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/auth/forms.py:167
+msgid "Password (again)"
+msgstr "Lozinka (ponovo)"
+
+#: 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 "Zbog provere, ponovite lozinku."
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:26
+#, python-format
+msgid "Enter a new password for the user %(username)s."
+msgstr "Unesite novu lozinku za korisnika %(username)s."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+msgid "Documentation bookmarklets"
+msgstr "Dokumentacioni \"bookmarklets\""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:8
+msgid ""
+"\n"
+"
To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site. Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").
\n"
+msgstr ""
+"\n"
+"
Da bi ste instalirali \"bookmarklet\", odvucite link u vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup nekima od strana mora biti sa kompjutera čija je IP adresa označena kao \"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je vaš IP označen kao \"internal\").
\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:18
+msgid "Documentation for this page"
+msgstr "Dokumentacija za ovu stranu"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Jumps you from any page to the documentation for the view that generates that page."
+msgstr "Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji generiše tu stranu."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:21
+msgid "Show object ID"
+msgstr "Prikažite ID objekta"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Shows the content-type and unique ID for pages that represent a single object."
+msgstr "Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:24
+msgid "Edit this object (current window)"
+msgstr "Izmena objekta (u aktivnom prozoru)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "Skače na admin stranu za strane koje predstavljaju objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:27
+msgid "Edit this object (new window)"
+msgstr "Izmeni objekat (novi prozor)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "As above, but opens the admin page in a new window."
+msgstr "Kao iznad, samo otvara admin stranu u novom prozoru."
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Hvala Vam na poseti."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Prijavite se ponovo"
+
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
+msgid "Password change"
+msgstr "Izmenite lozinku"
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr "Lozinka je uspešno izmenjena"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "Vaša lozinka je izmenjena."
+
+#: 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 "Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi provere ispravnosti unosa."
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "Stara lozinka:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "Nova lozinka:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "Potvrdite novu lozinku:"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "Izmenite moju lozinku"
+
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
+msgid "Password reset"
+msgstr "Resetovanje lozinke"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Vaša lozinka je uspešno resetovana"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
+msgstr "Nova lozinka vam je poslata na zadatu e-mail adresu. E-mail bi trebao da stigne u narednih nekoliko minuta."
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Primili ste ovaj e-mail jer ste zatražili resetovanje lozinke"
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "za vaš korisnički nalog na %(site_name)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr "Vaša nova lozinka je: %(new_password)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
+msgstr "Lozinku možete izmeniti na sledećoj strani:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "Vaše korisničko ime, u slučaju da ste zaboravili:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "Hvala Vam na poseti!"
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "%(site_name)s tim"
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
+msgstr "Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu lozinku na dati e-mail."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "E-mail adresa:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Resetujte moju lozinku"
+
+#: contrib/admin/templatetags/admin_list.py:257
+msgid "All dates"
+msgstr "Svi datumi"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s"
+msgstr "Izaberite %s"
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s to change"
+msgstr "Izaberite %s za izmenu"
+
+#: contrib/admindocs/views.py:53
+#: contrib/admindocs/views.py:55
+#: contrib/admindocs/views.py:57
+msgid "tag:"
+msgstr ""
+
+#: contrib/admindocs/views.py:87
+#: contrib/admindocs/views.py:89
+#: contrib/admindocs/views.py:91
+msgid "filter:"
+msgstr ""
+
+#: contrib/admindocs/views.py:153
+#: contrib/admindocs/views.py:155
+#: contrib/admindocs/views.py:157
+msgid "view:"
+msgstr ""
+
+#: contrib/admindocs/views.py:187
+#, python-format
+msgid "App %r not found"
+msgstr "Aplikacija %r nije nađena"
+
+#: contrib/admindocs/views.py:194
+#, python-format
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr "Model %(model_name)r nije nađen u aplikaciji %(app_label)r"
+
+#: contrib/admindocs/views.py:206
+#, python-format
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "povezani `%(app_label)s.%(data_type)s` objekti"
+
+#: contrib/admindocs/views.py:206
+#: contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:242
+#: contrib/admindocs/views.py:247
+msgid "model:"
+msgstr ""
+
+#: contrib/admindocs/views.py:237
+#, python-format
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "povezani `%(app_label)s.%(object_name)s` objekti"
+
+#: contrib/admindocs/views.py:242
+#, python-format
+msgid "all %s"
+msgstr "svi %s"
+
+#: contrib/admindocs/views.py:247
+#, python-format
+msgid "number of %s"
+msgstr "broj %s"
+
+#: contrib/admindocs/views.py:253
+#, python-format
+msgid "Fields on %s objects"
+msgstr "Polja u %s objekata"
+
+#: contrib/admindocs/views.py:317
+#: contrib/admindocs/views.py:328
+#: contrib/admindocs/views.py:330
+#: contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:337
+#: contrib/admindocs/views.py:339
+msgid "Integer"
+msgstr "Ceo broj"
+
+#: contrib/admindocs/views.py:318
+msgid "Boolean (Either True or False)"
+msgstr "Logička vrednost (Tačno ili Netačno)"
+
+#: contrib/admindocs/views.py:319
+#: contrib/admindocs/views.py:338
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Niz karaktera (maksimalno %(max_length)s karaktera)"
+
+#: contrib/admindocs/views.py:320
+msgid "Comma-separated integers"
+msgstr "Brojevi razdvojeni zarezima"
+
+#: contrib/admindocs/views.py:321
+msgid "Date (without time)"
+msgstr "Datum (bez vremena)"
+
+#: contrib/admindocs/views.py:322
+msgid "Date (with time)"
+msgstr "Datum (sa vremenom)"
+
+#: contrib/admindocs/views.py:323
+msgid "Decimal number"
+msgstr "Decimalni broj"
+
+#: contrib/admindocs/views.py:324
+msgid "E-mail address"
+msgstr "E-mail adresa"
+
+#: contrib/admindocs/views.py:325
+#: contrib/admindocs/views.py:326
+#: contrib/admindocs/views.py:329
+msgid "File path"
+msgstr "Putanja do datoteke"
+
+#: contrib/admindocs/views.py:327
+msgid "Floating point number"
+msgstr ""
+
+#: contrib/admindocs/views.py:331
+#: contrib/comments/models.py:89
+msgid "IP address"
+msgstr "IP adresa"
+
+#: contrib/admindocs/views.py:333
+msgid "Boolean (Either True, False or None)"
+msgstr "Logička vrednost (Tačno, Netačno ili prazno)"
+
+#: contrib/admindocs/views.py:334
+msgid "Relation to parent model"
+msgstr "Relacija ka nadređenom objektu"
+
+#: contrib/admindocs/views.py:335
+msgid "Phone number"
+msgstr "Telefonski broj"
+
+#: contrib/admindocs/views.py:340
+msgid "Text"
+msgstr "Tekst"
+
+#: contrib/admindocs/views.py:341
+msgid "Time"
+msgstr "Vreme"
+
+#: contrib/admindocs/views.py:342
+#: contrib/flatpages/models.py:8
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admindocs/views.py:343
+msgid "U.S. state (two uppercase letters)"
+msgstr "U.S. država (dva VELIKA slova)"
+
+#: contrib/admindocs/views.py:344
+msgid "XML text"
+msgstr "XML tekst"
+
+#: contrib/admindocs/views.py:370
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr "%s nije urlpattern objekt"
+
+#: contrib/auth/admin.py:17
+msgid "Personal info"
+msgstr "Lične informacije"
+
+#: contrib/auth/admin.py:18
+msgid "Permissions"
+msgstr "Dozvole"
+
+#: contrib/auth/admin.py:19
+msgid "Important dates"
+msgstr "Važni datumi"
+
+#: contrib/auth/admin.py:20
+msgid "Groups"
+msgstr "Grupe"
+
+#: contrib/auth/admin.py:47
+msgid "Add user"
+msgstr "Dodajte korisnika"
+
+#: contrib/auth/forms.py:13
+#: contrib/auth/models.py:134
+msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
+msgstr "Obavezno. 30 ili manje karaktera. Samo slova, brojevi i donja crta \"_\"."
+
+# nesh: Ovo je opis za stari SlugField
+#: contrib/auth/forms.py:14
+#: core/validators.py:72
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)."
+
+#: contrib/auth/forms.py:16
+msgid "Password confirmation"
+msgstr "Potvrdite lozinku"
+
+#: contrib/auth/forms.py:28
+msgid "A user with that username already exists."
+msgstr "Korisnik već postoji."
+
+#: contrib/auth/forms.py:34
+#: contrib/auth/forms.py:153
+#: contrib/auth/forms.py:178
+msgid "The two password fields didn't match."
+msgstr "Polja za lozinku nisu ista."
+
+#: contrib/auth/forms.py:72
+#: contrib/comments/views/comments.py:58
+msgid "This account is inactive."
+msgstr "Neaktivni nalog."
+
+#: contrib/auth/forms.py:77
+#: contrib/comments/views/comments.py:49
+msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
+msgstr "Vaš internet čitač nije prihvatio \"cookie\". \"Cookie\" podrška je potrebna da bi ste mogli da se prijavite."
+
+#: contrib/auth/forms.py:90
+msgid "E-mail"
+msgstr "E-mail"
+
+#: contrib/auth/forms.py:99
+msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?"
+msgstr "Ova e-mail adresa nije povezana sa nijednim korisničkim nalogom. Da li ste sigurni da ste registrovani?"
+
+#: contrib/auth/forms.py:124
+#, python-format
+msgid "Password reset on %s"
+msgstr "Resetovanje lozinke za %s"
+
+#: contrib/auth/forms.py:131
+msgid "Old password"
+msgstr "Stara lozinka"
+
+#: contrib/auth/forms.py:132
+msgid "New password"
+msgstr "Nova lozinka"
+
+#: contrib/auth/forms.py:133
+msgid "New password confirmation"
+msgstr "Potvrda nove lozinke"
+
+#: contrib/auth/forms.py:145
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Pogrešna stara lozinka. Unesite je ponovo."
+
+#: contrib/auth/models.py:73
+#: contrib/auth/models.py:93
+msgid "name"
+msgstr "ime"
+
+#: contrib/auth/models.py:75
+msgid "codename"
+msgstr "šifra dozvole"
+
+#: contrib/auth/models.py:78
+msgid "permission"
+msgstr "dozvola"
+
+#: contrib/auth/models.py:79
+#: contrib/auth/models.py:94
+msgid "permissions"
+msgstr "dozvole"
+
+#: contrib/auth/models.py:97
+msgid "group"
+msgstr "grupa"
+
+#: contrib/auth/models.py:98
+#: contrib/auth/models.py:144
+msgid "groups"
+msgstr "grupe"
+
+#: contrib/auth/models.py:134
+msgid "username"
+msgstr "korisničko ime"
+
+#: contrib/auth/models.py:135
+msgid "first name"
+msgstr "ime"
+
+#: contrib/auth/models.py:136
+msgid "last name"
+msgstr "prezime"
+
+#: contrib/auth/models.py:137
+msgid "e-mail address"
+msgstr "e-mail adresa"
+
+#: contrib/auth/models.py:138
+msgid "password"
+msgstr "lozinka"
+
+#: contrib/auth/models.py:138
+msgid "Use '[algo]$[salt]$[hexdigest]' or use the change password form."
+msgstr "Koristite '[algo]$[salt]$[hexdigest]' ili promeni lozinku."
+
+#: contrib/auth/models.py:139
+msgid "staff status"
+msgstr "dozvoljen pristup administraciji sajta"
+
+#: contrib/auth/models.py:139
+msgid "Designates whether the user can log into this admin site."
+msgstr "Da li korisnik ima pristup administratorskom delu sajta."
+
+#: contrib/auth/models.py:140
+msgid "active"
+msgstr "aktivan"
+
+#: contrib/auth/models.py:140
+msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
+msgstr "Označava aktivne korisnike. Koristite umesto brisanja naloga."
+
+#: contrib/auth/models.py:141
+msgid "superuser status"
+msgstr "da li je korisnik administrator"
+
+#: contrib/auth/models.py:141
+msgid "Designates that this user has all permissions without explicitly assigning them."
+msgstr "Označava korisnike koji imaju sva prava."
+
+#: contrib/auth/models.py:142
+msgid "last login"
+msgstr "vreme poslednje posete"
+
+#: contrib/auth/models.py:143
+msgid "date joined"
+msgstr "datum otvaranja naloga"
+
+#: contrib/auth/models.py:145
+msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
+msgstr "Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada."
+
+#: contrib/auth/models.py:146
+msgid "user permissions"
+msgstr "korisničke dozvole"
+
+#: contrib/auth/models.py:150
+msgid "user"
+msgstr "korisnik"
+
+#: contrib/auth/models.py:151
+msgid "users"
+msgstr "korisnici"
+
+#: contrib/auth/models.py:306
+msgid "message"
+msgstr "poruka"
+
+#: contrib/auth/views.py:49
+msgid "Logged out"
+msgstr "Odjavljeni ste"
+
+#: contrib/auth/views.py:116
+msgid "Password changed successfully."
+msgstr "Lozinka je uspešno izmenjena."
+
+#: contrib/auth/views.py:122
+#, python-format
+msgid "Change password: %s"
+msgstr "Izmenite lozinku: %s"
+
+#: contrib/comments/models.py:71
+#: contrib/comments/models.py:164
msgid "object ID"
msgstr "ID objekta"
-#: contrib/comments/models.py:68
-msgid "headline"
-msgstr "naslov"
+#: contrib/comments/models.py:72
+msgid "headline"
+msgstr "naslov"
+
+#: contrib/comments/models.py:73
+#: contrib/comments/models.py:95
+#: contrib/comments/models.py:165
+msgid "comment"
+msgstr "komentar"
+
+#: contrib/comments/models.py:74
+msgid "rating #1"
+msgstr "ocena #1"
+
+#: contrib/comments/models.py:75
+msgid "rating #2"
+msgstr "ocena #2"
+
+#: contrib/comments/models.py:76
+msgid "rating #3"
+msgstr "ocena #3"
+
+#: contrib/comments/models.py:77
+msgid "rating #4"
+msgstr "ocena #4"
+
+#: contrib/comments/models.py:78
+msgid "rating #5"
+msgstr "ocena #5"
+
+#: contrib/comments/models.py:79
+msgid "rating #6"
+msgstr "ocena #6"
+
+#: contrib/comments/models.py:80
+msgid "rating #7"
+msgstr "ocena #7"
+
+#: contrib/comments/models.py:81
+msgid "rating #8"
+msgstr "ocena #8"
+
+#: contrib/comments/models.py:86
+msgid "is valid rating"
+msgstr "da li je ocena validna"
+
+#: contrib/comments/models.py:87
+#: contrib/comments/models.py:167
+msgid "date/time submitted"
+msgstr "datum/vreme slanja"
+
+#: contrib/comments/models.py:88
+#: contrib/comments/models.py:168
+msgid "is public"
+msgstr "da li je javni"
+
+#: contrib/comments/models.py:90
+msgid "is removed"
+msgstr "da li je obrisan"
+
+#: contrib/comments/models.py:90
+msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
+msgstr "Izaberite ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je obrisan\" umesto teksta komentara."
+
+#: contrib/comments/models.py:96
+msgid "comments"
+msgstr "komentari"
+
+#: contrib/comments/models.py:128
+#: contrib/comments/models.py:199
+msgid "Content object"
+msgstr "Objekat sa sadržajem"
+
+#: contrib/comments/models.py:156
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+"Poslao %(user)s dana %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+
+#: contrib/comments/models.py:166
+msgid "person's name"
+msgstr "ime"
+
+#: contrib/comments/models.py:169
+msgid "ip address"
+msgstr "ip adresa"
+
+#: contrib/comments/models.py:171
+msgid "approved by staff"
+msgstr "odobreno od strane moderatora"
+
+#: contrib/comments/models.py:175
+msgid "free comment"
+msgstr "slobodan komentar"
+
+#: contrib/comments/models.py:176
+msgid "free comments"
+msgstr "slobodni komentari"
+
+#: contrib/comments/models.py:227
+msgid "score"
+msgstr "rezultat"
+
+#: contrib/comments/models.py:228
+msgid "score date"
+msgstr "datum rezultata"
+
+#: contrib/comments/models.py:232
+msgid "karma score"
+msgstr "\"karma\" rezultat"
+
+#: contrib/comments/models.py:233
+msgid "karma scores"
+msgstr "\"karma\" rezultati"
+
+#: contrib/comments/models.py:237
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr "Ocena %(score)d od strane %(user)s"
+
+#: contrib/comments/models.py:254
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Ovaj komentar je označen od %(user)s:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/models.py:262
+msgid "flag date"
+msgstr "datum označavanja"
+
+#: contrib/comments/models.py:266
+msgid "user flag"
+msgstr "korisnička oznaka"
+
+#: contrib/comments/models.py:267
+msgid "user flags"
+msgstr "korisničke oznake"
+
+#: contrib/comments/models.py:271
+#, python-format
+msgid "Flag by %r"
+msgstr "%r je označio"
+
+#: contrib/comments/models.py:277
+msgid "deletion date"
+msgstr "datum brisanja"
+
+#: contrib/comments/models.py:280
+msgid "moderator deletion"
+msgstr "brisanje od strane moderatora"
+
+#: contrib/comments/models.py:281
+msgid "moderator deletions"
+msgstr "brisanja od strane moderatora"
+
+#: contrib/comments/models.py:285
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr "Obrisao moderator %r"
+
+#: contrib/comments/templates/comments/form.html:8
+msgid "Forgotten your password?"
+msgstr "Zaboravili ste lozinku?"
+
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr "Ocene"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr "Obavezan unos"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr "Opcioni unos"
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr "Pošaljite sliku"
+
+#: contrib/comments/templates/comments/form.html:28
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "Komentar:"
+
+#: contrib/comments/templates/comments/form.html:35
+#: contrib/comments/templates/comments/freeform.html:10
+msgid "Preview comment"
+msgstr "Pregled komentara"
+
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr "Vaše ime:"
+
+# nesh: grrrrr, ala je rogobatno
+# petar: malo sam ga izmenio da bude jasniji
+#: contrib/comments/views/comments.py:76
+msgid "This rating is required because you've entered at least one other rating."
+msgstr "Ova ocena je obavezna pošto ste uneli bar jednu ocenu."
+
+#: contrib/comments/views/comments.py:160
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
+"\n"
+"%(text)s"
+msgstr[0] ""
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"\n"
+"%(text)s"
+msgstr[1] ""
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"\n"
+"%(text)s"
+msgstr[2] ""
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"\n"
+"%(text)s"
+
+# nesh: skethcy???
+# petar: Pojma nemam sta im to znaci
+#: contrib/comments/views/comments.py:165
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Komentar je poslat od strane \"sketchy\" korisnika:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:238
+#: contrib/comments/views/comments.py:331
+msgid "Only POSTs are allowed"
+msgstr "Jedino je POST dozvoljen"
+
+#: contrib/comments/views/comments.py:242
+#: contrib/comments/views/comments.py:335
+msgid "One or more of the required fields wasn't submitted"
+msgstr "Jedno ili više obaveznih polja nije poslato"
+
+#: contrib/comments/views/comments.py:246
+#: contrib/comments/views/comments.py:337
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr "Neko je menjao formu za komentare (povreda sigurnosti)"
+
+#: contrib/comments/views/comments.py:256
+#: contrib/comments/views/comments.py:343
+msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
+msgstr "Forma komentara ima neispravni 'target' parametar -- ID objekta je neispravan"
+
+#: contrib/comments/views/comments.py:307
+#: contrib/comments/views/comments.py:372
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "Ovaj komentar nije koristio ni 'preview' ni 'post'"
+
+#: contrib/comments/views/karma.py:21
+msgid "Anonymous users cannot vote"
+msgstr "Anonimni korisnici ne mogu da glasaju"
+
+#: contrib/comments/views/karma.py:25
+msgid "Invalid comment ID"
+msgstr "Neispravan ID komentara"
+
+#: contrib/comments/views/karma.py:27
+msgid "No voting for yourself"
+msgstr "Ne možete glasati sami za sebe"
+
+#: contrib/contenttypes/models.py:67
+msgid "python model class name"
+msgstr "naziv python modula"
+
+#: contrib/contenttypes/models.py:71
+msgid "content type"
+msgstr "tip sadržaja"
+
+#: contrib/contenttypes/models.py:72
+msgid "content types"
+msgstr "tipovi sadržaja"
+
+#: contrib/flatpages/admin.py:9
+msgid "Advanced options"
+msgstr "Napredne opcije"
+
+#: contrib/flatpages/models.py:9
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "Primer: '/o-nama/kontakt/'. Proverite da li ste uneli '/' na početku i na kraju."
+
+#: contrib/flatpages/models.py:10
+msgid "title"
+msgstr "naslov"
+
+#: contrib/flatpages/models.py:11
+msgid "content"
+msgstr "sadržaj"
+
+#: contrib/flatpages/models.py:12
+msgid "enable comments"
+msgstr "omogućite komentare"
+
+#: contrib/flatpages/models.py:13
+msgid "template name"
+msgstr "naziv templejta"
+
+#: contrib/flatpages/models.py:14
+msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."
+msgstr "Primer: 'flatpages/kontakt-stranica.html'. Ako ne zadate sistem će koristiti 'flatpages/default.html'."
+
+#: contrib/flatpages/models.py:15
+msgid "registration required"
+msgstr "samo za registrovane korisnike"
+
+#: contrib/flatpages/models.py:15
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj strani."
+
+#: contrib/flatpages/models.py:20
+msgid "flat page"
+msgstr "statična strana"
+
+#: contrib/flatpages/models.py:21
+msgid "flat pages"
+msgstr "statične strane"
+
+# th/rd se ne koriste kod nas
+#: contrib/humanize/templatetags/humanize.py:19
+msgid "th"
+msgstr ""
+
+# vidi "th"
+#: contrib/humanize/templatetags/humanize.py:19
+msgid "st"
+msgstr ""
+
+# vidi "th"
+#: contrib/humanize/templatetags/humanize.py:19
+msgid "nd"
+msgstr ""
+
+# vidi "th"
+#: contrib/humanize/templatetags/humanize.py:19
+msgid "rd"
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:51
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f milion"
+msgstr[1] "%(value).1f miliona"
+msgstr[2] "%(value).1f miliona"
+
+#: contrib/humanize/templatetags/humanize.py:54
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f milijarda"
+msgstr[1] "%(value).1f milijarde"
+msgstr[2] "%(value).1f milijardi"
+
+#: contrib/humanize/templatetags/humanize.py:57
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f bilion"
+msgstr[1] "%(value).1f biliona"
+msgstr[2] "%(value).1f biliona"
+
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "one"
+msgstr "jedan"
+
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "two"
+msgstr "dva"
+
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "three"
+msgstr "tri"
+
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "four"
+msgstr "četiri"
+
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "five"
+msgstr "pet"
+
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "six"
+msgstr "šest"
+
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "seven"
+msgstr "sedam"
+
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "eight"
+msgstr "osam"
+
+#: contrib/humanize/templatetags/humanize.py:73
+msgid "nine"
+msgstr "devet"
+
+#: contrib/humanize/templatetags/humanize.py:93
+msgid "today"
+msgstr "danas"
+
+#: contrib/humanize/templatetags/humanize.py:95
+msgid "tomorrow"
+msgstr "sutra"
+
+#: contrib/humanize/templatetags/humanize.py:97
+msgid "yesterday"
+msgstr "juče"
+
+#: contrib/localflavor/ar/forms.py:27
+msgid "Enter a postal code in the format NNNN or ANNNNAAA."
+msgstr ""
+
+#: contrib/localflavor/ar/forms.py:49
+#: contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/br/forms.py:135
+#: contrib/localflavor/pe/forms.py:23
+#: contrib/localflavor/pe/forms.py:51
+msgid "This field requires only numbers."
+msgstr "U ovo polje se mogu uneti samo brojevi."
+
+#: contrib/localflavor/ar/forms.py:50
+msgid "This field requires 7 or 8 digits."
+msgstr "Morate unete 7 ili 8 cifara."
+
+#: contrib/localflavor/ar/forms.py:79
+msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
+msgstr ""
+
+#: contrib/localflavor/ar/forms.py:80
+#, fuzzy
+msgid "Invalid CUIT."
+msgstr "Neispravan URL: %s"
+
+#: contrib/localflavor/at/at_states.py:5
+msgid "Burgenland"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:6
+msgid "Carinthia"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:7
+msgid "Lower Austria"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:8
+msgid "Upper Austria"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:9
+msgid "Salzburg"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:10
+#, fuzzy
+msgid "Styria"
+msgstr "Srpski"
+
+#: contrib/localflavor/at/at_states.py:11
+msgid "Tyrol"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:12
+msgid "Vorarlberg"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:13
+msgid "Vienna"
+msgstr ""
+
+#: contrib/localflavor/at/forms.py:20
+#: contrib/localflavor/ch/forms.py:16
+#: contrib/localflavor/no/forms.py:12
+#, fuzzy
+msgid "Enter a zip code in the format XXXX."
+msgstr "Unesite ispravno vreme u HH:MM formatu."
+
+#: contrib/localflavor/at/forms.py:48
+msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
+msgstr ""
+
+#: contrib/localflavor/au/forms.py:16
+msgid "Enter a 4 digit post code."
+msgstr ""
+
+#: contrib/localflavor/br/forms.py:21
+#, fuzzy
+msgid "Enter a zip code in the format XXXXX-XXX."
+msgstr "Unesite ispravno vreme u HH:MM formatu."
+
+# nesh: tel. brojevi su u američkom formatu, ovo se ionako neće koristiti u i18n delu
+#: contrib/localflavor/br/forms.py:30
+#, fuzzy
+msgid "Phone numbers must be in XX-XXXX-XXXX format."
+msgstr "Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan."
+
+#: contrib/localflavor/br/forms.py:58
+msgid "Select a valid brazilian state. That state is not one of the available states."
+msgstr ""
+
+#: contrib/localflavor/br/forms.py:94
+msgid "Invalid CPF number."
+msgstr ""
+
+#: contrib/localflavor/br/forms.py:95
+msgid "This field requires at most 11 digits or 14 characters."
+msgstr ""
+
+#: contrib/localflavor/br/forms.py:134
+msgid "Invalid CNPJ number."
+msgstr ""
+
+#: contrib/localflavor/br/forms.py:136
+#, fuzzy
+msgid "This field requires at least 14 digits"
+msgstr "Obavezno polje."
+
+#: contrib/localflavor/ca/forms.py:17
+#, fuzzy
+msgid "Enter a postal code in the format XXX XXX."
+msgstr "Unesite ispravno vreme u HH:MM formatu."
+
+#: contrib/localflavor/ca/forms.py:88
+msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:5
+msgid "Aargau"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:6
+msgid "Appenzell Innerrhoden"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:7
+msgid "Appenzell Ausserrhoden"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:8
+msgid "Basel-Stadt"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:9
+msgid "Basel-Land"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:10
+#, fuzzy
+msgid "Berne"
+msgstr "korisničko ime"
+
+#: contrib/localflavor/ch/ch_states.py:11
+msgid "Fribourg"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:12
+msgid "Geneva"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:13
+#, fuzzy
+msgid "Glarus"
+msgstr "Grupe"
+
+#: contrib/localflavor/ch/ch_states.py:14
+msgid "Graubuenden"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:15
+msgid "Jura"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:16
+#, fuzzy
+msgid "Lucerne"
+msgstr "korisničko ime"
+
+#: contrib/localflavor/ch/ch_states.py:17
+msgid "Neuchatel"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:18
+msgid "Nidwalden"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:19
+msgid "Obwalden"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:20
+msgid "Schaffhausen"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:21
+msgid "Schwyz"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:22
+msgid "Solothurn"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:23
+msgid "St. Gallen"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:24
+#, fuzzy
+msgid "Thurgau"
+msgstr "Četvrtak"
+
+#: contrib/localflavor/ch/ch_states.py:25
+msgid "Ticino"
+msgstr ""
-#: contrib/comments/models.py:69
-#: contrib/comments/models.py:90
-#: contrib/comments/models.py:167
-msgid "comment"
-msgstr "komentar"
+#: contrib/localflavor/ch/ch_states.py:26
+msgid "Uri"
+msgstr ""
-#: contrib/comments/models.py:70
-msgid "rating #1"
-msgstr "ocena #1"
+#: contrib/localflavor/ch/ch_states.py:27
+msgid "Valais"
+msgstr ""
-#: contrib/comments/models.py:71
-msgid "rating #2"
-msgstr "ocena #2"
+#: contrib/localflavor/ch/ch_states.py:28
+msgid "Vaud"
+msgstr ""
-#: contrib/comments/models.py:72
-msgid "rating #3"
-msgstr "ocena #3"
+#: contrib/localflavor/ch/ch_states.py:29
+#, fuzzy
+msgid "Zug"
+msgstr "avg"
-#: contrib/comments/models.py:73
-msgid "rating #4"
-msgstr "ocena #4"
+#: contrib/localflavor/ch/ch_states.py:30
+msgid "Zurich"
+msgstr ""
-#: contrib/comments/models.py:74
-msgid "rating #5"
-msgstr "ocena #5"
+#: contrib/localflavor/ch/forms.py:64
+msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
+msgstr ""
-#: contrib/comments/models.py:75
-msgid "rating #6"
-msgstr "ocena #6"
+#: contrib/localflavor/cl/forms.py:29
+#, fuzzy
+msgid "Enter a valid Chilean RUT."
+msgstr "Unesite ispravno ime fajla."
-#: contrib/comments/models.py:76
-msgid "rating #7"
-msgstr "ocena #7"
+#: contrib/localflavor/cl/forms.py:30
+msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
+msgstr ""
-#: contrib/comments/models.py:77
-msgid "rating #8"
-msgstr "ocena #8"
+#: contrib/localflavor/cl/forms.py:31
+#, fuzzy
+msgid "The Chilean RUT is not valid."
+msgstr "Neispravno polje."
-#: contrib/comments/models.py:82
-msgid "is valid rating"
-msgstr "da li je ocena validna"
+#: contrib/localflavor/de/de_states.py:5
+msgid "Baden-Wuerttemberg"
+msgstr ""
-#: contrib/comments/models.py:83
-#: contrib/comments/models.py:169
-msgid "date/time submitted"
-msgstr "datum/vreme slanja"
+#: contrib/localflavor/de/de_states.py:6
+msgid "Bavaria"
+msgstr ""
-#: contrib/comments/models.py:84
-#: contrib/comments/models.py:170
-msgid "is public"
-msgstr "da li je javni"
+#: contrib/localflavor/de/de_states.py:7
+#, fuzzy
+msgid "Berlin"
+msgstr "Brazilski"
-#: contrib/comments/models.py:85
-#: contrib/admin/views/doc.py:289
-msgid "IP address"
-msgstr "IP adresa"
+#: contrib/localflavor/de/de_states.py:8
+msgid "Brandenburg"
+msgstr ""
-#: contrib/comments/models.py:86
-msgid "is removed"
-msgstr "da li je obrisan"
+#: contrib/localflavor/de/de_states.py:9
+msgid "Bremen"
+msgstr ""
-#: contrib/comments/models.py:86
-msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
-msgstr "Izaberite ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je obrisan\" umesto teksta komentara."
+#: contrib/localflavor/de/de_states.py:10
+msgid "Hamburg"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:11
+#, fuzzy
+msgid "Hessen"
+msgstr "poruka"
+
+#: contrib/localflavor/de/de_states.py:12
+msgid "Mecklenburg-Western Pomerania"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:13
+msgid "Lower Saxony"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:14
+msgid "North Rhine-Westphalia"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:15
+msgid "Rhineland-Palatinate"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:16
+msgid "Saarland"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:17
+msgid "Saxony"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:18
+msgid "Saxony-Anhalt"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:19
+msgid "Schleswig-Holstein"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:20
+msgid "Thuringia"
+msgstr ""
+
+#: contrib/localflavor/de/forms.py:14
+#: contrib/localflavor/fi/forms.py:12
+#: contrib/localflavor/fr/forms.py:15
+#, fuzzy
+msgid "Enter a zip code in the format XXXXX."
+msgstr "Unesite ispravno vreme u HH:MM formatu."
+
+#: contrib/localflavor/de/forms.py:41
+msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format."
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:5
+msgid "Arava"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:6
+msgid "Albacete"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:7
+msgid "Alacant"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:8
+msgid "Almeria"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:9
+msgid "Avila"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:10
+msgid "Badajoz"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:11
+msgid "Illes Balears"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:12
+msgid "Barcelona"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:13
+msgid "Burgos"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:14
+msgid "Caceres"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:15
+msgid "Cadiz"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:16
+msgid "Castello"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:17
+msgid "Ciudad Real"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:18
+msgid "Cordoba"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:19
+msgid "A Coruna"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:20
+msgid "Cuenca"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:21
+msgid "Girona"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:22
+#, fuzzy
+msgid "Granada"
+msgstr "Nemački"
+
+#: contrib/localflavor/es/es_provinces.py:23
+msgid "Guadalajara"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:24
+msgid "Guipuzkoa"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:25
+msgid "Huelva"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:26
+#, fuzzy
+msgid "Huesca"
+msgstr "Utorak"
+
+#: contrib/localflavor/es/es_provinces.py:27
+#, fuzzy
+msgid "Jaen"
+msgstr "Jan."
+
+#: contrib/localflavor/es/es_provinces.py:28
+msgid "Leon"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:29
+msgid "Lleida"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:30
+#: contrib/localflavor/es/es_regions.py:17
+msgid "La Rioja"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:31
+msgid "Lugo"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:32
+#: contrib/localflavor/es/es_regions.py:18
+msgid "Madrid"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:33
+msgid "Malaga"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:34
+msgid "Murcia"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:35
+msgid "Navarre"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:36
+msgid "Ourense"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:37
+msgid "Asturias"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:38
+#, fuzzy
+msgid "Palencia"
+msgstr "Galski"
+
+#: contrib/localflavor/es/es_provinces.py:39
+msgid "Las Palmas"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:40
+msgid "Pontevedra"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:41
+msgid "Salamanca"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:42
+msgid "Santa Cruz de Tenerife"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:43
+#: contrib/localflavor/es/es_regions.py:11
+msgid "Cantabria"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:44
+#, fuzzy
+msgid "Segovia"
+msgstr "Slovenački"
+
+#: contrib/localflavor/es/es_provinces.py:45
+msgid "Seville"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:46
+#, fuzzy
+msgid "Soria"
+msgstr "Srpski"
+
+#: contrib/localflavor/es/es_provinces.py:47
+msgid "Tarragona"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:48
+msgid "Teruel"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:49
+msgid "Toledo"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:50
+#, fuzzy
+msgid "Valencia"
+msgstr "Galski"
+
+#: contrib/localflavor/es/es_provinces.py:51
+msgid "Valladolid"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:52
+msgid "Bizkaia"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:53
+msgid "Zamora"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:54
+msgid "Zaragoza"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:55
+msgid "Ceuta"
+msgstr ""
+
+#: contrib/localflavor/es/es_provinces.py:56
+msgid "Melilla"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:5
+msgid "Andalusia"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:6
+msgid "Aragon"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:7
+msgid "Principality of Asturias"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:8
+msgid "Balearic Islands"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:9
+msgid "Basque Country"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:10
+msgid "Canary Islands"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:12
+msgid "Castile-La Mancha"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:13
+msgid "Castile and Leon"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:14
+#, fuzzy
+msgid "Catalonia"
+msgstr "Italijanski"
+
+#: contrib/localflavor/es/es_regions.py:15
+msgid "Extremadura"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:16
+#, fuzzy
+msgid "Galicia"
+msgstr "Galski"
+
+#: contrib/localflavor/es/es_regions.py:19
+msgid "Region of Murcia"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:20
+msgid "Foral Community of Navarre"
+msgstr ""
+
+#: contrib/localflavor/es/es_regions.py:21
+msgid "Valencian Community"
+msgstr ""
+
+#: contrib/localflavor/es/forms.py:19
+msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
+msgstr ""
+
+#: contrib/localflavor/es/forms.py:39
+msgid "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX."
+msgstr ""
+
+#: contrib/localflavor/es/forms.py:66
+#, fuzzy
+msgid "Please enter a valid NIF, NIE, or CIF."
+msgstr "Unesite ispravnu IP adresu."
+
+#: contrib/localflavor/es/forms.py:67
+#, fuzzy
+msgid "Please enter a valid NIF or NIE."
+msgstr "Unesite ispravan %s."
+
+#: contrib/localflavor/es/forms.py:68
+msgid "Invalid checksum for NIF."
+msgstr ""
+
+#: contrib/localflavor/es/forms.py:69
+msgid "Invalid checksum for NIE."
+msgstr ""
+
+#: contrib/localflavor/es/forms.py:70
+msgid "Invalid checksum for CIF."
+msgstr ""
+
+#: contrib/localflavor/es/forms.py:142
+msgid "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
+msgstr ""
+
+#: contrib/localflavor/es/forms.py:143
+msgid "Invalid checksum for bank account number."
+msgstr ""
+
+#: contrib/localflavor/fi/forms.py:28
+#, fuzzy
+msgid "Enter a valid Finnish social security number."
+msgstr "Unesite ispravno ime fajla."
-#: contrib/comments/models.py:91
-msgid "comments"
-msgstr "komentari"
+#: contrib/localflavor/in_/forms.py:14
+#, fuzzy
+msgid "Enter a zip code in the format XXXXXXX."
+msgstr "Unesite ispravno vreme u HH:MM formatu."
-#: contrib/comments/models.py:131
-#: contrib/comments/models.py:207
-msgid "Content object"
-msgstr "Objekat sa sadržajem"
+#: contrib/localflavor/is_/forms.py:17
+msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
+msgstr ""
-#: contrib/comments/models.py:159
-#, python-format
-msgid ""
-"Posted by %(user)s at %(date)s\n"
-"\n"
-"%(comment)s\n"
-"\n"
-"http://%(domain)s%(url)s"
+#: contrib/localflavor/is_/forms.py:18
+msgid "The Icelandic identification number is not valid."
msgstr ""
-"Poslao %(user)s dana %(date)s\n"
-"\n"
-"%(comment)s\n"
-"\n"
-"http://%(domain)s%(url)s"
-#: contrib/comments/models.py:168
-msgid "person's name"
-msgstr "ime"
+#: contrib/localflavor/it/forms.py:14
+#, fuzzy
+msgid "Enter a valid zip code."
+msgstr "Unesite ispravno ime fajla."
-#: contrib/comments/models.py:171
-msgid "ip address"
-msgstr "ip adresa"
+#: contrib/localflavor/it/forms.py:43
+#, fuzzy
+msgid "Enter a valid Social Security number."
+msgstr "Unesite ispravno ime fajla."
-#: contrib/comments/models.py:173
-msgid "approved by staff"
-msgstr "odobreno od strane moderatora"
+#: contrib/localflavor/it/forms.py:68
+#, fuzzy
+msgid "Enter a valid VAT number."
+msgstr "Unesite ispravno ime fajla."
-#: contrib/comments/models.py:176
-msgid "free comment"
-msgstr "slobodan komentar"
+#: contrib/localflavor/jp/forms.py:17
+msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
+msgstr ""
-#: contrib/comments/models.py:177
-msgid "free comments"
-msgstr "slobodni komentari"
+#: contrib/localflavor/jp/jp_prefectures.py:4
+msgid "Hokkaido"
+msgstr ""
-#: contrib/comments/models.py:233
-msgid "score"
-msgstr "rezultat"
+#: contrib/localflavor/jp/jp_prefectures.py:5
+msgid "Aomori"
+msgstr ""
-#: contrib/comments/models.py:234
-msgid "score date"
-msgstr "datum rezultata"
+#: contrib/localflavor/jp/jp_prefectures.py:6
+msgid "Iwate"
+msgstr ""
-#: contrib/comments/models.py:237
-msgid "karma score"
-msgstr "\"karma\" rezultat"
+#: contrib/localflavor/jp/jp_prefectures.py:7
+msgid "Miyagi"
+msgstr ""
-#: contrib/comments/models.py:238
-msgid "karma scores"
-msgstr "\"karma\" rezultati"
+#: contrib/localflavor/jp/jp_prefectures.py:8
+msgid "Akita"
+msgstr ""
-#: contrib/comments/models.py:242
-#, python-format
-msgid "%(score)d rating by %(user)s"
-msgstr "Ocena %(score)d od strane %(user)s"
+#: contrib/localflavor/jp/jp_prefectures.py:9
+msgid "Yamagata"
+msgstr ""
-#: contrib/comments/models.py:258
-#, python-format
-msgid ""
-"This comment was flagged by %(user)s:\n"
-"\n"
-"%(text)s"
+#: contrib/localflavor/jp/jp_prefectures.py:10
+msgid "Fukushima"
msgstr ""
-"Ovaj komentar je označen od %(user)s:\n"
-"\n"
-"%(text)s"
-#: contrib/comments/models.py:265
-msgid "flag date"
-msgstr "datum označavanja"
+#: contrib/localflavor/jp/jp_prefectures.py:11
+msgid "Ibaraki"
+msgstr ""
-#: contrib/comments/models.py:268
-msgid "user flag"
-msgstr "korisnička oznaka"
+#: contrib/localflavor/jp/jp_prefectures.py:12
+msgid "Tochigi"
+msgstr ""
-#: contrib/comments/models.py:269
-msgid "user flags"
-msgstr "korisničke oznake"
+#: contrib/localflavor/jp/jp_prefectures.py:13
+msgid "Gunma"
+msgstr ""
-#: contrib/comments/models.py:273
-#, python-format
-msgid "Flag by %r"
-msgstr "%r je označio"
+#: contrib/localflavor/jp/jp_prefectures.py:14
+msgid "Saitama"
+msgstr ""
-#: contrib/comments/models.py:278
-msgid "deletion date"
-msgstr "datum brisanja"
+#: contrib/localflavor/jp/jp_prefectures.py:15
+msgid "Chiba"
+msgstr ""
-#: contrib/comments/models.py:280
-msgid "moderator deletion"
-msgstr "brisanje od strane moderatora"
+#: contrib/localflavor/jp/jp_prefectures.py:16
+msgid "Tokyo"
+msgstr ""
-#: contrib/comments/models.py:281
-msgid "moderator deletions"
-msgstr "brisanja od strane moderatora"
+#: contrib/localflavor/jp/jp_prefectures.py:17
+msgid "Kanagawa"
+msgstr ""
-#: contrib/comments/models.py:285
-#, python-format
-msgid "Moderator deletion by %r"
-msgstr "Obrisao moderator %r"
+#: contrib/localflavor/jp/jp_prefectures.py:18
+msgid "Yamanashi"
+msgstr ""
-#: contrib/comments/views/karma.py:19
-msgid "Anonymous users cannot vote"
-msgstr "Anonimni korisnici ne mogu da glasaju"
+#: contrib/localflavor/jp/jp_prefectures.py:19
+msgid "Nagano"
+msgstr ""
-#: contrib/comments/views/karma.py:23
-msgid "Invalid comment ID"
-msgstr "Neispravan ID komentara"
+#: contrib/localflavor/jp/jp_prefectures.py:20
+msgid "Niigata"
+msgstr ""
-#: contrib/comments/views/karma.py:25
-msgid "No voting for yourself"
-msgstr "Ne možete glasati sami za sebe"
+#: contrib/localflavor/jp/jp_prefectures.py:21
+msgid "Toyama"
+msgstr ""
-# nesh: grrrrr, ala je rogobatno
-# petar: malo sam ga izmenio da bude jasniji
-#: contrib/comments/views/comments.py:28
-msgid "This rating is required because you've entered at least one other rating."
-msgstr "Ova ocena je obavezna pošto ste uneli bar jednu ocenu."
+#: contrib/localflavor/jp/jp_prefectures.py:22
+msgid "Ishikawa"
+msgstr ""
-#: contrib/comments/views/comments.py:112
-#, python-format
-msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
-"\n"
-"%(text)s"
-msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
-"\n"
-"%(text)s"
-msgstr[0] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
-"\n"
-"%(text)s"
-msgstr[1] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
-"\n"
-"%(text)s"
-msgstr[2] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
-"\n"
-"%(text)s"
+#: contrib/localflavor/jp/jp_prefectures.py:23
+msgid "Fukui"
+msgstr ""
-# nesh: skethcy???
-# petar: Pojma nemam sta im to znaci
-#: contrib/comments/views/comments.py:117
-#, python-format
-msgid ""
-"This comment was posted by a sketchy user:\n"
-"\n"
-"%(text)s"
+#: contrib/localflavor/jp/jp_prefectures.py:24
+msgid "Gifu"
msgstr ""
-"Komentar je poslat od strane \"sketchy\" korisnika:\n"
-"\n"
-"%(text)s"
-#: contrib/comments/views/comments.py:189
-#: contrib/comments/views/comments.py:280
-msgid "Only POSTs are allowed"
-msgstr "Jedino je POST dozvoljen"
+#: contrib/localflavor/jp/jp_prefectures.py:25
+msgid "Shizuoka"
+msgstr ""
-#: contrib/comments/views/comments.py:193
-#: contrib/comments/views/comments.py:284
-msgid "One or more of the required fields wasn't submitted"
-msgstr "Jedno ili više obaveznih polja nije poslato"
+#: contrib/localflavor/jp/jp_prefectures.py:26
+msgid "Aichi"
+msgstr ""
-#: contrib/comments/views/comments.py:197
-#: contrib/comments/views/comments.py:286
-msgid "Somebody tampered with the comment form (security violation)"
-msgstr "Neko je menjao formu za komentare (povreda sigurnosti)"
+#: contrib/localflavor/jp/jp_prefectures.py:27
+msgid "Mie"
+msgstr ""
-#: contrib/comments/views/comments.py:207
-#: contrib/comments/views/comments.py:292
-msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
-msgstr "Forma komentara ima neispravni 'target' parametar -- ID objekta je neispravan"
+#: contrib/localflavor/jp/jp_prefectures.py:28
+msgid "Shiga"
+msgstr ""
-#: contrib/comments/views/comments.py:257
-#: contrib/comments/views/comments.py:321
-msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr "Ovaj komentar nije koristio ni 'preview' ni 'post'"
+#: contrib/localflavor/jp/jp_prefectures.py:29
+msgid "Kyoto"
+msgstr ""
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/login.html:17
-msgid "Username:"
-msgstr "Korisničko ime:"
+#: contrib/localflavor/jp/jp_prefectures.py:30
+msgid "Osaka"
+msgstr ""
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/admin/templates/admin/login.html:20
-msgid "Password:"
-msgstr "Lozinka:"
+#: contrib/localflavor/jp/jp_prefectures.py:31
+msgid "Hyogo"
+msgstr ""
-#: contrib/comments/templates/comments/form.html:6
-msgid "Forgotten your password?"
-msgstr "Zaboravili ste lozinku?"
+#: contrib/localflavor/jp/jp_prefectures.py:32
+msgid "Nara"
+msgstr ""
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Log out"
-msgstr "Odjavite se"
+#: contrib/localflavor/jp/jp_prefectures.py:33
+msgid "Wakayama"
+msgstr ""
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
-msgstr "Ocene"
+#: contrib/localflavor/jp/jp_prefectures.py:34
+msgid "Tottori"
+msgstr ""
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-msgstr "Obavezan unos"
+#: contrib/localflavor/jp/jp_prefectures.py:35
+#, fuzzy
+msgid "Shimane"
+msgstr "Izmenite"
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-msgstr "Opcioni unos"
+#: contrib/localflavor/jp/jp_prefectures.py:36
+msgid "Okayama"
+msgstr ""
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-msgstr "Pošaljite sliku"
+#: contrib/localflavor/jp/jp_prefectures.py:37
+msgid "Hiroshima"
+msgstr ""
-#: contrib/comments/templates/comments/form.html:27
-#: contrib/comments/templates/comments/freeform.html:5
-msgid "Comment:"
-msgstr "Komentar:"
+#: contrib/localflavor/jp/jp_prefectures.py:38
+msgid "Yamaguchi"
+msgstr ""
-#: contrib/comments/templates/comments/form.html:32
-#: contrib/comments/templates/comments/freeform.html:9
-msgid "Preview comment"
-msgstr "Pregled komentara"
+#: contrib/localflavor/jp/jp_prefectures.py:39
+msgid "Tokushima"
+msgstr ""
-#: contrib/comments/templates/comments/freeform.html:4
-msgid "Your name:"
-msgstr "Vaše ime:"
+#: contrib/localflavor/jp/jp_prefectures.py:40
+msgid "Kagawa"
+msgstr ""
-#: contrib/admin/filterspecs.py:40
-#, python-format
-msgid ""
-"
To install bookmarklets, drag the link to your bookmarks\n"
-"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site. Note that some of these\n"
-"bookmarklets require you to be viewing the site from a computer designated\n"
-"as \"internal\" (talk to your system administrator if you aren't sure if\n"
-"your computer is \"internal\").
\n"
+#: contrib/localflavor/sk/sk_districts.py:48
+msgid "Nove Mesto nad Vahom"
msgstr ""
-"\n"
-"
Da bi ste instalirali \"bookmarklet\", odvucite link u vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup nekima od strana mora biti sa kompjutera čija je IP adresa označena kao \"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je vaš IP označen kao \"internal\").
\n"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-msgstr "Dokumentacija za ovu stranu"
+#: contrib/localflavor/sk/sk_districts.py:49
+msgid "Nove Zamky"
+msgstr ""
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid "Jumps you from any page to the documentation for the view that generates that page."
-msgstr "Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji generiše tu stranu."
+#: contrib/localflavor/sk/sk_districts.py:50
+msgid "Partizanske"
+msgstr ""
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
-msgstr "Prikažite ID objekta"
+#: contrib/localflavor/sk/sk_districts.py:51
+msgid "Pezinok"
+msgstr ""
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan objekt."
+#: contrib/localflavor/sk/sk_districts.py:52
+msgid "Piestany"
+msgstr ""
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-msgstr "Izmena objekta (u aktivnom prozoru)"
+#: contrib/localflavor/sk/sk_districts.py:53
+msgid "Poltar"
+msgstr ""
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Skače na admin stranu za strane koje predstavljaju objekt."
+#: contrib/localflavor/sk/sk_districts.py:54
+msgid "Poprad"
+msgstr ""
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-msgstr "Izmeni objekat (novi prozor)"
+#: contrib/localflavor/sk/sk_districts.py:55
+msgid "Povazska Bystrica"
+msgstr ""
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
-msgstr "Kao iznad, samo otvara admin stranu u novom prozoru."
+#: contrib/localflavor/sk/sk_districts.py:56
+msgid "Presov"
+msgstr ""
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Datum:"
+#: contrib/localflavor/sk/sk_districts.py:57
+msgid "Prievidza"
+msgstr ""
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Vreme:"
+#: contrib/localflavor/sk/sk_districts.py:58
+msgid "Puchov"
+msgstr ""
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Trenutno:"
+#: contrib/localflavor/sk/sk_districts.py:59
+msgid "Revuca"
+msgstr ""
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Izmenite:"
+#: contrib/localflavor/sk/sk_districts.py:60
+msgid "Rimavska Sobota"
+msgstr ""
-#: contrib/redirects/models.py:7
-msgid "redirect from"
-msgstr "preusmeri od"
+#: contrib/localflavor/sk/sk_districts.py:61
+msgid "Roznava"
+msgstr ""
-#: contrib/redirects/models.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Unesite apsolutnu putanju bez imena domena. Primer: '/dogadjaji/pretraga/'."
+#: contrib/localflavor/sk/sk_districts.py:62
+msgid "Ruzomberok"
+msgstr ""
-#: contrib/redirects/models.py:9
-msgid "redirect to"
-msgstr "preusmeri ka"
+#: contrib/localflavor/sk/sk_districts.py:63
+msgid "Sabinov"
+msgstr ""
+
+#: contrib/localflavor/sk/sk_districts.py:64
+msgid "Senec"
+msgstr ""
-#: contrib/redirects/models.py:10
-msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
-msgstr "Može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa 'http://'."
+#: contrib/localflavor/sk/sk_districts.py:65
+#, fuzzy
+msgid "Senica"
+msgstr "Slovenački"
-#: contrib/redirects/models.py:12
-msgid "redirect"
-msgstr "Preusmeravanje"
+#: contrib/localflavor/sk/sk_districts.py:66
+#, fuzzy
+msgid "Skalica"
+msgstr "Galski"
-#: contrib/redirects/models.py:13
-msgid "redirects"
-msgstr "Preusmeravanja"
+#: contrib/localflavor/sk/sk_districts.py:67
+msgid "Snina"
+msgstr ""
-#: contrib/flatpages/models.py:8
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Primer: '/o-nama/kontakt/'. Proverite da li ste uneli '/' na početku i na kraju."
+#: contrib/localflavor/sk/sk_districts.py:68
+msgid "Sobrance"
+msgstr ""
-#: contrib/flatpages/models.py:9
-msgid "title"
-msgstr "naslov"
+#: contrib/localflavor/sk/sk_districts.py:69
+msgid "Spisska Nova Ves"
+msgstr ""
-#: contrib/flatpages/models.py:10
-msgid "content"
-msgstr "sadržaj"
+#: contrib/localflavor/sk/sk_districts.py:70
+msgid "Stara Lubovna"
+msgstr ""
-#: contrib/flatpages/models.py:11
-msgid "enable comments"
-msgstr "omogućite komentare"
+#: contrib/localflavor/sk/sk_districts.py:71
+msgid "Stropkov"
+msgstr ""
-#: contrib/flatpages/models.py:12
-msgid "template name"
-msgstr "naziv templejta"
+#: contrib/localflavor/sk/sk_districts.py:72
+msgid "Svidnik"
+msgstr ""
-#: contrib/flatpages/models.py:13
-msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
-msgstr "Primer: 'flatpages/kontakt-stranica'. Ako ne zadate sistem će koristiti 'flatpages/default'."
+#: contrib/localflavor/sk/sk_districts.py:73
+msgid "Sala"
+msgstr ""
-#: contrib/flatpages/models.py:14
-msgid "registration required"
-msgstr "samo za registrovane korisnike"
+#: contrib/localflavor/sk/sk_districts.py:74
+msgid "Topolcany"
+msgstr ""
-#: contrib/flatpages/models.py:14
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj strani."
+#: contrib/localflavor/sk/sk_districts.py:75
+msgid "Trebisov"
+msgstr ""
-#: contrib/flatpages/models.py:18
-msgid "flat page"
-msgstr "statična strana"
+#: contrib/localflavor/sk/sk_districts.py:76
+#, fuzzy
+msgid "Trencin"
+msgstr "Francuski"
-#: contrib/flatpages/models.py:19
-msgid "flat pages"
-msgstr "statične strane"
+#: contrib/localflavor/sk/sk_districts.py:77
+msgid "Trnava"
+msgstr ""
-#: contrib/auth/models.py:13
-#: contrib/auth/models.py:26
-msgid "name"
-msgstr "ime"
+#: contrib/localflavor/sk/sk_districts.py:78
+msgid "Turcianske Teplice"
+msgstr ""
-#: contrib/auth/models.py:15
-msgid "codename"
-msgstr "šifra dozvole"
+#: contrib/localflavor/sk/sk_districts.py:79
+msgid "Tvrdosin"
+msgstr ""
-#: contrib/auth/models.py:17
-msgid "permission"
-msgstr "dozvola"
+#: contrib/localflavor/sk/sk_districts.py:80
+msgid "Velky Krtis"
+msgstr ""
-#: contrib/auth/models.py:18
-#: contrib/auth/models.py:27
-msgid "permissions"
-msgstr "dozvole"
+#: contrib/localflavor/sk/sk_districts.py:81
+msgid "Vranov nad Toplou"
+msgstr ""
-#: contrib/auth/models.py:29
-msgid "group"
-msgstr "grupa"
+#: contrib/localflavor/sk/sk_districts.py:82
+msgid "Zlate Moravce"
+msgstr ""
-#: contrib/auth/models.py:30
-#: contrib/auth/models.py:65
-msgid "groups"
-msgstr "grupe"
+#: contrib/localflavor/sk/sk_districts.py:83
+msgid "Zvolen"
+msgstr ""
-#: contrib/auth/models.py:55
-msgid "username"
-msgstr "korisničko ime"
+#: contrib/localflavor/sk/sk_districts.py:84
+msgid "Zarnovica"
+msgstr ""
-#: contrib/auth/models.py:56
-msgid "first name"
-msgstr "ime"
+#: contrib/localflavor/sk/sk_districts.py:85
+msgid "Ziar nad Hronom"
+msgstr ""
-#: contrib/auth/models.py:57
-msgid "last name"
-msgstr "prezime"
+#: contrib/localflavor/sk/sk_districts.py:86
+msgid "Zilina"
+msgstr ""
-#: contrib/auth/models.py:58
-msgid "e-mail address"
-msgstr "e-mail adresa"
+#: contrib/localflavor/sk/sk_regions.py:8
+msgid "Banska Bystrica region"
+msgstr ""
-#: contrib/auth/models.py:59
-msgid "password"
-msgstr "lozinka"
+#: contrib/localflavor/sk/sk_regions.py:9
+msgid "Bratislava region"
+msgstr ""
-#: contrib/auth/models.py:59
-msgid "Use '[algo]$[salt]$[hexdigest]'"
-msgstr "Koristite '[algo]$[salt]$[hexdigest]'"
+#: contrib/localflavor/sk/sk_regions.py:10
+msgid "Kosice region"
+msgstr ""
-#: contrib/auth/models.py:60
-msgid "staff status"
-msgstr "dozvoljen pristup administraciji sajta"
+#: contrib/localflavor/sk/sk_regions.py:11
+msgid "Nitra region"
+msgstr ""
-#: contrib/auth/models.py:60
-msgid "Designates whether the user can log into this admin site."
-msgstr "Da li korisnik ima pristup administratorskom delu sajta."
+#: contrib/localflavor/sk/sk_regions.py:12
+msgid "Presov region"
+msgstr ""
-#: contrib/auth/models.py:61
-msgid "active"
-msgstr "aktivan"
+#: contrib/localflavor/sk/sk_regions.py:13
+msgid "Trencin region"
+msgstr ""
-#: contrib/auth/models.py:62
-msgid "superuser status"
-msgstr "da li je korisnik administrator"
+#: contrib/localflavor/sk/sk_regions.py:14
+msgid "Trnava region"
+msgstr ""
-#: contrib/auth/models.py:63
-msgid "last login"
-msgstr "vreme poslednje posete"
+#: contrib/localflavor/sk/sk_regions.py:15
+msgid "Zilina region"
+msgstr ""
-#: contrib/auth/models.py:64
-msgid "date joined"
-msgstr "datum otvaranja naloga"
+#: contrib/localflavor/uk/forms.py:21
+#, fuzzy
+msgid "Enter a valid postcode."
+msgstr "Unesite ispravno ime fajla."
-#: contrib/auth/models.py:66
-msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
-msgstr "Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada."
+#: contrib/localflavor/uk/uk_regions.py:11
+msgid "Bedfordshire"
+msgstr ""
-#: contrib/auth/models.py:67
-msgid "user permissions"
-msgstr "korisničke dozvole"
+#: contrib/localflavor/uk/uk_regions.py:12
+msgid "Buckinghamshire"
+msgstr ""
-#: contrib/auth/models.py:70
-msgid "user"
-msgstr "korisnik"
+#: contrib/localflavor/uk/uk_regions.py:14
+msgid "Cheshire"
+msgstr ""
-#: contrib/auth/models.py:71
-msgid "users"
-msgstr "korisnici"
+#: contrib/localflavor/uk/uk_regions.py:15
+msgid "Cornwall and Isles of Scilly"
+msgstr ""
-#: contrib/auth/models.py:76
-msgid "Personal info"
-msgstr "Lične informacije"
+#: contrib/localflavor/uk/uk_regions.py:16
+msgid "Cumbria"
+msgstr ""
-#: contrib/auth/models.py:77
-msgid "Permissions"
-msgstr "Dozvole"
+#: contrib/localflavor/uk/uk_regions.py:17
+msgid "Derbyshire"
+msgstr ""
-#: contrib/auth/models.py:78
-msgid "Important dates"
-msgstr "Važni datumi"
+#: contrib/localflavor/uk/uk_regions.py:18
+msgid "Devon"
+msgstr ""
-#: contrib/auth/models.py:79
-msgid "Groups"
-msgstr "Grupe"
+#: contrib/localflavor/uk/uk_regions.py:19
+msgid "Dorset"
+msgstr ""
-#: contrib/auth/models.py:219
-msgid "message"
-msgstr "poruka"
+#: contrib/localflavor/uk/uk_regions.py:20
+msgid "Durham"
+msgstr ""
-#: contrib/auth/forms.py:30
-msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
-msgstr "Vaš internet čitač nije prihvatio \"cookie\". \"Cookie\" podrška je potrebna da bi ste mogli da se prijavite."
+#: contrib/localflavor/uk/uk_regions.py:21
+msgid "East Sussex"
+msgstr ""
-#: contrib/contenttypes/models.py:25
-msgid "python model class name"
-msgstr "naziv python modula"
+#: contrib/localflavor/uk/uk_regions.py:22
+msgid "Essex"
+msgstr ""
-#: contrib/contenttypes/models.py:28
-msgid "content type"
-msgstr "tip sadržaja"
+#: contrib/localflavor/uk/uk_regions.py:23
+msgid "Gloucestershire"
+msgstr ""
-#: contrib/contenttypes/models.py:29
-msgid "content types"
-msgstr "tipovi sadržaja"
+#: contrib/localflavor/uk/uk_regions.py:24
+msgid "Greater London"
+msgstr ""
-#: contrib/sessions/models.py:35
-msgid "session key"
-msgstr "ključ sesije"
+#: contrib/localflavor/uk/uk_regions.py:25
+msgid "Greater Manchester"
+msgstr ""
-#: contrib/sessions/models.py:36
-msgid "session data"
-msgstr "podaci sesije"
+#: contrib/localflavor/uk/uk_regions.py:26
+msgid "Hampshire"
+msgstr ""
-#: contrib/sessions/models.py:37
-msgid "expire date"
-msgstr "datum prestanka važenja sesije"
+#: contrib/localflavor/uk/uk_regions.py:27
+msgid "Hertfordshire"
+msgstr ""
-#: contrib/sessions/models.py:41
-msgid "session"
-msgstr "sesija"
+#: contrib/localflavor/uk/uk_regions.py:28
+msgid "Kent"
+msgstr ""
-#: contrib/sessions/models.py:42
-msgid "sessions"
-msgstr "sesije"
+#: contrib/localflavor/uk/uk_regions.py:29
+msgid "Lancashire"
+msgstr ""
-#: contrib/sites/models.py:10
-msgid "domain name"
-msgstr "ime domena"
+#: contrib/localflavor/uk/uk_regions.py:30
+msgid "Leicestershire"
+msgstr ""
-#: contrib/sites/models.py:11
-msgid "display name"
-msgstr "naziv"
+#: contrib/localflavor/uk/uk_regions.py:31
+msgid "Lincolnshire"
+msgstr ""
-#: contrib/sites/models.py:15
-msgid "site"
-msgstr "sajt"
+#: contrib/localflavor/uk/uk_regions.py:32
+msgid "Merseyside"
+msgstr ""
-#: contrib/sites/models.py:16
-msgid "sites"
-msgstr "sajtovi"
+#: contrib/localflavor/uk/uk_regions.py:33
+msgid "Norfolk"
+msgstr ""
-#: utils/translation.py:360
-msgid "DATE_FORMAT"
-msgstr "D, d.m.Y."
+#: contrib/localflavor/uk/uk_regions.py:34
+msgid "North Yorkshire"
+msgstr ""
-#: utils/translation.py:361
-msgid "DATETIME_FORMAT"
-msgstr "d.m.Y. H:i:s"
+#: contrib/localflavor/uk/uk_regions.py:35
+msgid "Northamptonshire"
+msgstr ""
-#: utils/translation.py:362
-msgid "TIME_FORMAT"
-msgstr "H:i:s"
+#: contrib/localflavor/uk/uk_regions.py:36
+msgid "Northumberland"
+msgstr ""
-#: utils/dates.py:6
-msgid "Monday"
-msgstr "Ponedeljak"
+#: contrib/localflavor/uk/uk_regions.py:37
+msgid "Nottinghamshire"
+msgstr ""
-#: utils/dates.py:6
-msgid "Tuesday"
-msgstr "Utorak"
+#: contrib/localflavor/uk/uk_regions.py:38
+msgid "Oxfordshire"
+msgstr ""
-#: utils/dates.py:6
-msgid "Wednesday"
-msgstr "Sreda"
+#: contrib/localflavor/uk/uk_regions.py:39
+msgid "Shropshire"
+msgstr ""
-#: utils/dates.py:6
-msgid "Thursday"
-msgstr "Četvrtak"
+#: contrib/localflavor/uk/uk_regions.py:40
+msgid "Somerset"
+msgstr ""
-#: utils/dates.py:6
-msgid "Friday"
-msgstr "Petak"
+#: contrib/localflavor/uk/uk_regions.py:41
+msgid "South Yorkshire"
+msgstr ""
-#: utils/dates.py:7
-msgid "Saturday"
-msgstr "Subota"
+#: contrib/localflavor/uk/uk_regions.py:42
+msgid "Staffordshire"
+msgstr ""
-#: utils/dates.py:7
-msgid "Sunday"
-msgstr "Nedelja"
+#: contrib/localflavor/uk/uk_regions.py:43
+msgid "Suffolk"
+msgstr ""
-#: utils/dates.py:14
-msgid "January"
-msgstr "Januar"
+#: contrib/localflavor/uk/uk_regions.py:44
+#, fuzzy
+msgid "Surrey"
+msgstr "Trenutno:"
-#: utils/dates.py:14
-msgid "February"
-msgstr "Februar"
+#: contrib/localflavor/uk/uk_regions.py:45
+msgid "Tyne and Wear"
+msgstr ""
-#: utils/dates.py:14
-#: utils/dates.py:27
-msgid "March"
-msgstr "Mart"
+#: contrib/localflavor/uk/uk_regions.py:46
+msgid "Warwickshire"
+msgstr ""
-#: utils/dates.py:14
-#: utils/dates.py:27
-msgid "April"
-msgstr "April"
+#: contrib/localflavor/uk/uk_regions.py:47
+msgid "West Midlands"
+msgstr ""
-#: utils/dates.py:14
-#: utils/dates.py:27
-msgid "May"
-msgstr "Maj"
+#: contrib/localflavor/uk/uk_regions.py:48
+msgid "West Sussex"
+msgstr ""
-#: utils/dates.py:14
-#: utils/dates.py:27
-msgid "June"
-msgstr "Jun"
+#: contrib/localflavor/uk/uk_regions.py:49
+msgid "West Yorkshire"
+msgstr ""
-#: utils/dates.py:15
-#: utils/dates.py:27
-msgid "July"
-msgstr "Jul"
+#: contrib/localflavor/uk/uk_regions.py:50
+msgid "Wiltshire"
+msgstr ""
-#: utils/dates.py:15
-msgid "August"
-msgstr "Avgust"
+#: contrib/localflavor/uk/uk_regions.py:51
+msgid "Worcestershire"
+msgstr ""
-#: utils/dates.py:15
-msgid "September"
-msgstr "Septembar"
+#: contrib/localflavor/uk/uk_regions.py:55
+msgid "County Antrim"
+msgstr ""
-#: utils/dates.py:15
-msgid "October"
-msgstr "Oktobar"
+#: contrib/localflavor/uk/uk_regions.py:56
+msgid "County Armagh"
+msgstr ""
-#: utils/dates.py:15
-msgid "November"
-msgstr "Novembar"
+#: contrib/localflavor/uk/uk_regions.py:57
+msgid "County Down"
+msgstr ""
-#: utils/dates.py:16
-msgid "December"
-msgstr "Decembar"
+#: contrib/localflavor/uk/uk_regions.py:58
+msgid "County Fermanagh"
+msgstr ""
-#: utils/dates.py:19
-msgid "jan"
-msgstr "jan"
+#: contrib/localflavor/uk/uk_regions.py:59
+msgid "County Londonderry"
+msgstr ""
-#: utils/dates.py:19
-msgid "feb"
-msgstr "feb"
+#: contrib/localflavor/uk/uk_regions.py:60
+msgid "County Tyrone"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:64
+msgid "Clwyd"
+msgstr ""
-#: utils/dates.py:19
-msgid "mar"
-msgstr "mar"
+#: contrib/localflavor/uk/uk_regions.py:65
+msgid "Dyfed"
+msgstr ""
-#: utils/dates.py:19
-msgid "apr"
-msgstr "apr"
+#: contrib/localflavor/uk/uk_regions.py:66
+msgid "Gwent"
+msgstr ""
-#: utils/dates.py:19
-msgid "may"
-msgstr "maj"
+#: contrib/localflavor/uk/uk_regions.py:67
+msgid "Gwynedd"
+msgstr ""
-#: utils/dates.py:19
-msgid "jun"
-msgstr "jun"
+#: contrib/localflavor/uk/uk_regions.py:68
+msgid "Mid Glamorgan"
+msgstr ""
-#: utils/dates.py:20
-msgid "jul"
-msgstr "jul"
+#: contrib/localflavor/uk/uk_regions.py:69
+msgid "Powys"
+msgstr ""
-#: utils/dates.py:20
-msgid "aug"
-msgstr "avg"
+#: contrib/localflavor/uk/uk_regions.py:70
+msgid "South Glamorgan"
+msgstr ""
-#: utils/dates.py:20
-msgid "sep"
-msgstr "sep"
+#: contrib/localflavor/uk/uk_regions.py:71
+msgid "West Glamorgan"
+msgstr ""
-#: utils/dates.py:20
-msgid "oct"
-msgstr "okt"
+#: contrib/localflavor/uk/uk_regions.py:75
+#, fuzzy
+msgid "Borders"
+msgstr "Red:"
-#: utils/dates.py:20
-msgid "nov"
-msgstr "nov"
+#: contrib/localflavor/uk/uk_regions.py:76
+msgid "Central Scotland"
+msgstr ""
-#: utils/dates.py:20
-msgid "dec"
-msgstr "dec"
+#: contrib/localflavor/uk/uk_regions.py:77
+msgid "Dumfries and Galloway"
+msgstr ""
-#: utils/dates.py:27
-msgid "Jan."
-msgstr "Jan."
+#: contrib/localflavor/uk/uk_regions.py:78
+msgid "Fife"
+msgstr ""
-#: utils/dates.py:27
-msgid "Feb."
-msgstr "Feb."
+#: contrib/localflavor/uk/uk_regions.py:79
+#, fuzzy
+msgid "Grampian"
+msgstr "Nemački"
-#: utils/dates.py:28
-msgid "Aug."
-msgstr "Avg."
+#: contrib/localflavor/uk/uk_regions.py:80
+msgid "Highland"
+msgstr ""
-#: utils/dates.py:28
-msgid "Sept."
-msgstr "Sept."
+#: contrib/localflavor/uk/uk_regions.py:81
+#, fuzzy
+msgid "Lothian"
+msgstr "Prijavite se"
-#: utils/dates.py:28
-msgid "Oct."
-msgstr "Okt."
+#: contrib/localflavor/uk/uk_regions.py:82
+msgid "Orkney Islands"
+msgstr ""
-#: utils/dates.py:28
-msgid "Nov."
-msgstr "Nov."
+#: contrib/localflavor/uk/uk_regions.py:83
+msgid "Shetland Islands"
+msgstr ""
-#: utils/dates.py:28
-msgid "Dec."
-msgstr "Dec."
+#: contrib/localflavor/uk/uk_regions.py:84
+msgid "Strathclyde"
+msgstr ""
-#: utils/timesince.py:12
-msgid "year"
-msgid_plural "years"
-msgstr[0] "godina"
-msgstr[1] "godine"
-msgstr[2] "godina"
+#: contrib/localflavor/uk/uk_regions.py:85
+msgid "Tayside"
+msgstr ""
-#: utils/timesince.py:13
-msgid "month"
-msgid_plural "months"
-msgstr[0] "mesec"
-msgstr[1] "meseca"
-msgstr[2] "meseci"
+#: contrib/localflavor/uk/uk_regions.py:86
+msgid "Western Isles"
+msgstr ""
-#: utils/timesince.py:14
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "nedelja"
-msgstr[1] "nedelje"
-msgstr[2] "nedelja"
+#: contrib/localflavor/uk/uk_regions.py:90
+msgid "England"
+msgstr ""
-#: utils/timesince.py:15
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dan"
-msgstr[1] "dana"
-msgstr[2] "dana"
+#: contrib/localflavor/uk/uk_regions.py:91
+msgid "Northern Ireland"
+msgstr ""
-#: utils/timesince.py:16
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "sat"
-msgstr[1] "sata"
-msgstr[2] "sati"
+#: contrib/localflavor/uk/uk_regions.py:92
+msgid "Scotland"
+msgstr ""
-#: utils/timesince.py:17
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "munuta"
-msgstr[2] "minuta"
+#: contrib/localflavor/uk/uk_regions.py:93
+msgid "Wales"
+msgstr ""
-#: conf/global_settings.py:37
-msgid "Bengali"
-msgstr "Bengalski"
+#: contrib/localflavor/us/forms.py:16
+msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
+msgstr ""
-#: conf/global_settings.py:38
-msgid "Czech"
-msgstr "Češki"
+#: contrib/localflavor/us/forms.py:54
+msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
+msgstr ""
-#: conf/global_settings.py:39
-msgid "Welsh"
-msgstr "Welšski"
+#: contrib/localflavor/za/forms.py:20
+#, fuzzy
+msgid "Enter a valid South African ID number"
+msgstr "Unesite ispravno ime fajla."
-#: conf/global_settings.py:40
-msgid "Danish"
-msgstr "Danski"
+#: contrib/localflavor/za/forms.py:54
+#, fuzzy
+msgid "Enter a valid South African postal code"
+msgstr "Unesite ispravno ime fajla."
-#: conf/global_settings.py:41
-msgid "German"
-msgstr "Nemački"
+#: contrib/localflavor/za/za_provinces.py:4
+msgid "Eastern Cape"
+msgstr ""
-#: conf/global_settings.py:42
-msgid "Greek"
-msgstr "Grčki"
+#: contrib/localflavor/za/za_provinces.py:5
+msgid "Free State"
+msgstr ""
-#: conf/global_settings.py:43
-msgid "English"
-msgstr "Engleski"
+#: contrib/localflavor/za/za_provinces.py:6
+msgid "Gauteng"
+msgstr ""
-#: conf/global_settings.py:44
-msgid "Spanish"
-msgstr "Španski"
+#: contrib/localflavor/za/za_provinces.py:7
+msgid "KwaZulu-Natal"
+msgstr ""
-#: conf/global_settings.py:45
-msgid "French"
-msgstr "Francuski"
+#: contrib/localflavor/za/za_provinces.py:8
+msgid "Limpopo"
+msgstr ""
-#: conf/global_settings.py:46
-msgid "Galician"
-msgstr "Galski"
+#: contrib/localflavor/za/za_provinces.py:9
+msgid "Mpumalanga"
+msgstr ""
-#: conf/global_settings.py:47
-msgid "Hungarian"
-msgstr "Mađarski"
+#: contrib/localflavor/za/za_provinces.py:10
+msgid "Northern Cape"
+msgstr ""
-#: conf/global_settings.py:48
-msgid "Hebrew"
-msgstr "Hebrejski"
+#: contrib/localflavor/za/za_provinces.py:11
+msgid "North West"
+msgstr ""
-#: conf/global_settings.py:49
-msgid "Icelandic"
-msgstr "Islandski"
+#: contrib/localflavor/za/za_provinces.py:12
+msgid "Western Cape"
+msgstr ""
-#: conf/global_settings.py:50
-msgid "Italian"
-msgstr "Italijanski"
+#: contrib/redirects/models.py:7
+msgid "redirect from"
+msgstr "preusmeri od"
-#: conf/global_settings.py:51
-msgid "Japanese"
-msgstr "Japanski"
+#: contrib/redirects/models.py:8
+msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
+msgstr "Unesite apsolutnu putanju bez imena domena. Primer: '/dogadjaji/pretraga/'."
-#: conf/global_settings.py:52
-msgid "Dutch"
-msgstr "Holandski"
+#: contrib/redirects/models.py:9
+msgid "redirect to"
+msgstr "preusmeri ka"
-#: conf/global_settings.py:53
-msgid "Norwegian"
-msgstr "Norveški"
+#: contrib/redirects/models.py:10
+msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
+msgstr "Može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa 'http://'."
-#: conf/global_settings.py:54
-msgid "Brazilian"
-msgstr "Brazilski"
+#: contrib/redirects/models.py:13
+msgid "redirect"
+msgstr "Preusmeravanje"
-#: conf/global_settings.py:55
-msgid "Romanian"
-msgstr "Rumunski"
+#: contrib/redirects/models.py:14
+msgid "redirects"
+msgstr "Preusmeravanja"
-#: conf/global_settings.py:56
-msgid "Russian"
-msgstr "Ruski"
+#: contrib/sessions/models.py:45
+msgid "session key"
+msgstr "ključ sesije"
-#: conf/global_settings.py:57
-msgid "Slovak"
-msgstr "Slovački"
+#: contrib/sessions/models.py:47
+msgid "session data"
+msgstr "podaci sesije"
-#: conf/global_settings.py:58
-msgid "Slovenian"
-msgstr "Slovenački"
+#: contrib/sessions/models.py:48
+msgid "expire date"
+msgstr "datum prestanka važenja sesije"
-#: conf/global_settings.py:59
-msgid "Serbian"
-msgstr "Srpski"
+#: contrib/sessions/models.py:53
+msgid "session"
+msgstr "sesija"
-#: conf/global_settings.py:60
-msgid "Swedish"
-msgstr "Švedski"
+#: contrib/sessions/models.py:54
+msgid "sessions"
+msgstr "sesije"
-#: conf/global_settings.py:61
-msgid "Ukrainian"
-msgstr "Ukrajinski"
+#: contrib/sites/models.py:32
+msgid "domain name"
+msgstr "ime domena"
-#: conf/global_settings.py:62
-msgid "Simplified Chinese"
-msgstr "Kineski (pojednostavljen)"
+#: contrib/sites/models.py:33
+msgid "display name"
+msgstr "naziv"
-#: conf/global_settings.py:63
-msgid "Traditional Chinese"
-msgstr "Tradicionalni Kineski"
+#: contrib/sites/models.py:38
+msgid "site"
+msgstr "sajt"
-# nesh: Ovo je opis za stari SlugField
-#: core/validators.py:60
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)."
+#: contrib/sites/models.py:39
+msgid "sites"
+msgstr "sajtovi"
-#: core/validators.py:64
+#: core/validators.py:76
msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
msgstr "Ovo polje može sadržati samo slova, brojeve, donju crtu (_), crtu (-) i kose crte."
-#: core/validators.py:72
+#: core/validators.py:80
+#, fuzzy
+msgid "This value must contain only letters, numbers, underscores or hyphens."
+msgstr "Ovo polje može sadržati samo slova, brojeve, donju crtu (_), crtu (-) i kose crte."
+
+#: core/validators.py:84
msgid "Uppercase letters are not allowed here."
msgstr "Velika slova nisu dozvoljena."
-#: core/validators.py:76
+#: core/validators.py:88
msgid "Lowercase letters are not allowed here."
msgstr "Mala slova nisu dozvoljena."
-#: core/validators.py:83
+#: core/validators.py:95
msgid "Enter only digits separated by commas."
msgstr "Unesite brojeve razdvojene zarezima."
-#: core/validators.py:95
+#: core/validators.py:107
msgid "Enter valid e-mail addresses separated by commas."
msgstr "Unesite ispravne e-mail adrese razdvojene zarezima."
-#: core/validators.py:99
+#: core/validators.py:111
msgid "Please enter a valid IP address."
msgstr "Unesite ispravnu IP adresu."
-#: core/validators.py:103
+#: core/validators.py:115
msgid "Empty values are not allowed here."
msgstr "Prazne vrednosti nisu dozvoljene."
-#: core/validators.py:107
+#: core/validators.py:119
msgid "Non-numeric characters aren't allowed here."
msgstr "Ovde možete uneti samo brojeve."
-#: core/validators.py:111
+#: core/validators.py:123
msgid "This value can't be comprised solely of digits."
msgstr "Podatak se ne može sastojati samo od brojeva."
-#: core/validators.py:116
+#: core/validators.py:128
+#: forms/fields.py:158
msgid "Enter a whole number."
msgstr "Unesite celi broj."
-#: core/validators.py:120
+#: core/validators.py:132
msgid "Only alphabetical characters are allowed here."
msgstr "Ovde možete koristiti samo slova."
-#: core/validators.py:124
+#: core/validators.py:147
+#, python-format
+msgid "Invalid date: %s"
+msgstr "Neispravan datum: %s"
+
+#: core/validators.py:152
+#: db/models/fields/__init__.py:574
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Unesite ispravan datum u YYYY-MM-DD formatu."
-#: core/validators.py:128
+#: core/validators.py:157
msgid "Enter a valid time in HH:MM format."
msgstr "Unesite ispravno vreme u HH:MM formatu."
-#: core/validators.py:132
-#: db/models/fields/__init__.py:468
+#: core/validators.py:161
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Unesite ispravan datum i vreme u YYYY-MM-DD HH:MM formatu."
-#: core/validators.py:136
+#: core/validators.py:166
+#: forms/fields.py:409
msgid "Enter a valid e-mail address."
msgstr "Unesite ispravnu e-mail adresu."
-#: core/validators.py:148
+#: core/validators.py:178
+#: core/validators.py:470
+#: forms/fields.py:427
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "Fajl nije poslat, proverite tip enkoding form-a."
+
+#: core/validators.py:189
+#: forms/fields.py:467
msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
msgstr "Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam fajl oštećen."
-#: core/validators.py:155
+#: core/validators.py:196
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "URL %s ne pokazuje na ispravnu sliku"
# nesh: tel. brojevi su u američkom formatu, ovo se ionako neće koristiti u i18n delu
-#: core/validators.py:159
+#: core/validators.py:200
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
msgstr "Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan."
-#: core/validators.py:167
+#: core/validators.py:208
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "URL %s ne pokazuje na ispravni QuickTime video fajl."
-#: core/validators.py:171
+#: core/validators.py:212
msgid "A valid URL is required."
msgstr "Unesite ispravan URL."
-#: core/validators.py:185
+#: core/validators.py:226
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
@@ -1655,28 +3761,28 @@ msgstr ""
"Unesite ispravan HTML. Greške su:\n"
"%s"
-#: core/validators.py:192
+#: core/validators.py:233
#, python-format
msgid "Badly formed XML: %s"
msgstr "Neispravan XML: %s"
-#: core/validators.py:202
+#: core/validators.py:250
#, python-format
msgid "Invalid URL: %s"
msgstr "Neispravan URL: %s"
-#: core/validators.py:206
-#: core/validators.py:208
+#: core/validators.py:255
+#: core/validators.py:257
#, python-format
msgid "The URL %s is a broken link."
msgstr "URL %s je neispravan link."
# nesh: Ni ovo nije interesantno za i18n
-#: core/validators.py:214
+#: core/validators.py:263
msgid "Enter a valid U.S. state abbreviation."
msgstr "Unesite ispravnu skraćenicu za U.S. državu."
-#: core/validators.py:229
+#: core/validators.py:277
#, 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."
@@ -1684,44 +3790,59 @@ msgstr[0] "Pripazi na jezik! %s reč nije ovde dozvoljena."
msgstr[1] "Pripazi na jezik! %s reči nisu ovde dozvoljene."
msgstr[2] "Pripazi na jezik! %s reči nisu ovde dozvoljene."
-#: core/validators.py:236
+#: core/validators.py:284
#, python-format
msgid "This field must match the '%s' field."
msgstr "Ovo polje mora biti jednako sa poljem '%s'."
-#: core/validators.py:255
+#: core/validators.py:303
msgid "Please enter something for at least one field."
msgstr "Morate popuniti barem jedno polje."
-#: core/validators.py:264
-#: core/validators.py:275
+#: core/validators.py:312
+#: core/validators.py:323
msgid "Please enter both fields or leave them both empty."
msgstr "Popunite oba polja ili oba ostavite prazna."
-#: core/validators.py:282
+#: core/validators.py:331
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "Ovo polje mora biti uneto ako polje %(field)s ima vrednost %(value)s"
-#: core/validators.py:294
+#: core/validators.py:344
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr "Ovo polje mora biti uneto ako polje %(field)s nema vrednost %(value)s"
-#: core/validators.py:313
+#: core/validators.py:363
msgid "Duplicate values are not allowed."
msgstr "Duple vrednosti nisu dozvoljene."
-#: core/validators.py:336
+#: core/validators.py:378
+#, python-format
+msgid "This value must be between %(lower)s and %(upper)s."
+msgstr "Vrednost mora biti između %(lower)s i %(upper)s."
+
+#: core/validators.py:380
+#, python-format
+msgid "This value must be at least %s."
+msgstr "Vrednost mora biti najmanje %s."
+
+#: core/validators.py:382
+#, python-format
+msgid "This value must be no more than %s."
+msgstr "Vrednost ne sme biti veća od %s."
+
+#: core/validators.py:423
#, python-format
msgid "This value must be a power of %s."
msgstr "Vrednost mora biti stepena %s."
-#: core/validators.py:347
+#: core/validators.py:433
msgid "Please enter a valid decimal number."
msgstr "Unesite ispravan decimalni broj."
-#: core/validators.py:349
+#: core/validators.py:440
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
msgid_plural "Please enter a valid decimal number with at most %s total digits."
@@ -1729,7 +3850,15 @@ msgstr[0] "Unesite ispravan decimalni broj sa %s cifrom."
msgstr[1] "Unesite ispravan decimalni broj sa %s cifre."
msgstr[2] "Unesite ispravan decimalni broj sa %s cifara."
-#: core/validators.py:352
+#: core/validators.py:443
+#, python-format
+msgid "Please enter a valid decimal number with a whole part of at most %s digit."
+msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
+msgstr[0] "Unesite ispravan decimalni broj sa celim delom od najviše %s cifre."
+msgstr[1] "Unesite ispravan decimalni broj sa celim delom od najviše %s cifre."
+msgstr[2] "Unesite ispravan decimalni broj sa celim delom od najviše %s cifara."
+
+#: core/validators.py:446
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural "Please enter a valid decimal number with at most %s decimal places."
@@ -1737,112 +3866,131 @@ msgstr[0] "Unesite decimalni broj sa najviše %s decimalnim mestom."
msgstr[1] "Unesite decimalni broj sa najviše %s decimalna mesta."
msgstr[2] "Unesite decimalni broj sa najviše %s decimalnih mesta."
-#: core/validators.py:362
+#: core/validators.py:454
+msgid "Please enter a valid floating point number."
+msgstr "Unesite ispravan decimalni broj."
+
+#: core/validators.py:463
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "Veličina fajla mora biti najmanje %s bajtova."
-#: core/validators.py:363
+#: core/validators.py:464
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "Veličina fajla mora biti najviše %s bajtova."
-#: core/validators.py:376
+#: core/validators.py:481
msgid "The format for this field is wrong."
msgstr "Pogrešan format polja."
-#: core/validators.py:391
+#: core/validators.py:496
msgid "This field is invalid."
msgstr "Neispravno polje."
-#: core/validators.py:426
+#: core/validators.py:532
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "Ništa nije moglo da se skine sa URL-a %s."
-#: core/validators.py:429
+#: core/validators.py:535
#, python-format
msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
msgstr "Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(contenttype)s'."
-#: core/validators.py:462
+#: core/validators.py:568
#, python-format
msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
msgstr "Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%(start)s\".)"
-#: core/validators.py:466
+#: core/validators.py:572
#, python-format
msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
msgstr "Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red počinje sa \"%(start)s\".)"
-#: core/validators.py:471
+#: core/validators.py:577
#, python-format
msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
msgstr "Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)s\".)"
-#: core/validators.py:476
+#: core/validators.py:582
#, python-format
msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
msgstr "Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)"
-#: core/validators.py:480
+#: core/validators.py:586
#, python-format
msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
msgstr "Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%(start)s\".)"
-#: core/validators.py:485
+#: core/validators.py:591
#, python-format
msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
msgstr "Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje sa \"%(start)s\".)"
-#: db/models/manipulators.py:302
+#: db/models/manipulators.py:304
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "%(object)s sa ovim tipom %(type)s već postoji za polje %(field)s."
-#: db/models/fields/__init__.py:40
+#: db/models/fields/__init__.py:47
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "%(optname)s sa ovim %(fieldname)s već postoji."
-#: db/models/fields/__init__.py:114
-#: db/models/fields/__init__.py:265
-#: db/models/fields/__init__.py:542
-#: db/models/fields/__init__.py:553
-#: forms/__init__.py:346
+#: db/models/fields/__init__.py:175
+#: db/models/fields/__init__.py:348
+#: db/models/fields/__init__.py:797
+#: db/models/fields/__init__.py:808
+#: forms/fields.py:52
+#: oldforms/__init__.py:374
msgid "This field is required."
msgstr "Obavezno polje."
-#: db/models/fields/__init__.py:337
+#: db/models/fields/__init__.py:462
msgid "This value must be an integer."
msgstr "Vrednost mora biti celi broj."
-#: db/models/fields/__init__.py:369
+#: db/models/fields/__init__.py:508
msgid "This value must be either True or False."
msgstr "Vrednost mora biti True ili False."
-#: db/models/fields/__init__.py:385
+#: db/models/fields/__init__.py:537
msgid "This field cannot be null."
msgstr "Polje ne može sadržati praznu vrednost."
-#: db/models/fields/__init__.py:562
+#: db/models/fields/__init__.py:639
+#: db/models/fields/__init__.py:656
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[ss[.uuuuuu]] format."
+msgstr "Unesite ispravan datum i vreme u YYYY-MM-DD HH:MM[ss[.uuuuuu]] formatu."
+
+#: db/models/fields/__init__.py:712
+msgid "This value must be a decimal number."
+msgstr "Vrednost mora biti decimalni broj."
+
+#: db/models/fields/__init__.py:817
msgid "Enter a valid filename."
msgstr "Unesite ispravno ime fajla."
-#: db/models/fields/related.py:43
+#: db/models/fields/__init__.py:1018
+msgid "This value must be either None, True or False."
+msgstr "Vrednost mora biti None, True ili False."
+
+#: db/models/fields/__init__.py:1133
+#: db/models/fields/__init__.py:1146
+msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
+msgstr "Unesite ispravno vreme u HH:MM[:ss[.uuuuuu]] formatu."
+
+#: db/models/fields/related.py:93
#, python-format
msgid "Please enter a valid %s."
msgstr "Unesite ispravan %s."
-#: db/models/fields/related.py:579
-msgid "Separate multiple IDs with commas."
-msgstr "Odvojite višestruke ID-ove zarezima."
-
-#: db/models/fields/related.py:581
+#: db/models/fields/related.py:730
msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više stavki."
-#: db/models/fields/related.py:625
+#: db/models/fields/related.py:774
#, 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."
@@ -1850,7 +3998,111 @@ msgstr[0] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
msgstr[1] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
msgstr[2] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
-#: forms/__init__.py:380
+#: forms/fields.py:53
+msgid "Enter a valid value."
+msgstr "Unesite ispravnu vrednost."
+
+#: forms/fields.py:130
+#, python-format
+msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
+msgstr "Proverite dužinu, maksimum je %(max)d karaktera (dobijeno %(length)d)."
+
+#: forms/fields.py:131
+#, python-format
+msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
+msgstr "Proverite dužinu, minimum je %(min)d karaktera (dobijeno %(length)d)."
+
+#: forms/fields.py:159
+#: forms/fields.py:188
+#: forms/fields.py:217
+#, python-format
+msgid "Ensure this value is less than or equal to %s."
+msgstr "Vrednost mora biti manja ili jednaka %s."
+
+#: forms/fields.py:160
+#: forms/fields.py:189
+#: forms/fields.py:218
+#, python-format
+msgid "Ensure this value is greater than or equal to %s."
+msgstr "Proverite da li je vrednost veća ili jednaka %s."
+
+#: forms/fields.py:187
+#: forms/fields.py:216
+msgid "Enter a number."
+msgstr "Unesite broj."
+
+#: forms/fields.py:219
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Proverite da nema više od %s cifara."
+
+#: forms/fields.py:220
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Proverite da nema više od %s decimalnih mesta."
+
+#: forms/fields.py:221
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Proverite da nema više od %s cifara u celom delu."
+
+#: forms/fields.py:269
+#: forms/fields.py:799
+msgid "Enter a valid date."
+msgstr "Unesite ispravan datum."
+
+#: forms/fields.py:302
+#: forms/fields.py:800
+msgid "Enter a valid time."
+msgstr "Unesite ispravno vreme."
+
+#: forms/fields.py:341
+msgid "Enter a valid date/time."
+msgstr "Unesite ispravan datum i vreme."
+
+#: forms/fields.py:428
+msgid "No file was submitted."
+msgstr "Fajl nije poslat."
+
+#: forms/fields.py:429
+#: oldforms/__init__.py:693
+msgid "The submitted file is empty."
+msgstr "Poslati fajl je prazan."
+
+#: forms/fields.py:528
+msgid "Enter a valid URL."
+msgstr "Unesite ispravan URL."
+
+#: forms/fields.py:529
+msgid "This URL appears to be a broken link."
+msgstr "URL je neispravan link."
+
+#: forms/fields.py:597
+#: forms/fields.py:648
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr "Izaberite validnu opciju. %(value)s nije među njima."
+
+#: forms/fields.py:649
+#: forms/fields.py:710
+#: forms/models.py:581
+msgid "Enter a list of values."
+msgstr "Unesite listu vrednosti."
+
+#: forms/fields.py:828
+msgid "Enter a valid IPv4 address."
+msgstr "Unesite IPv4 adresu."
+
+#: forms/models.py:514
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Izaberite validnu opciju. Izabrana opcija nije validna."
+
+#: forms/models.py:582
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "Izaberite validnu opciju. Opcija %s nije validna."
+
+#: oldforms/__init__.py:409
#, python-format
msgid "Ensure your text is less than %s character."
msgid_plural "Ensure your text is less than %s characters."
@@ -1858,37 +4110,373 @@ msgstr[0] "Tekst mora imati manje od %s slova."
msgstr[1] "Tekst mora imati manje od %s slova."
msgstr[2] "Tekst mora imati manje od %s slova."
-#: forms/__init__.py:385
+#: oldforms/__init__.py:414
msgid "Line breaks are not allowed here."
msgstr "Novi redovi ovde nisu dozvoljeni."
-#: forms/__init__.py:480
-#: forms/__init__.py:551
-#: forms/__init__.py:589
+#: oldforms/__init__.py:512
+#: oldforms/__init__.py:586
+#: oldforms/__init__.py:625
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Izaberite validnu opciju: '%(data)s' nije u %(choices)s."
-#: forms/__init__.py:645
-msgid "The submitted file is empty."
-msgstr "Poslati fajl je prazan."
-
-#: forms/__init__.py:699
+#: oldforms/__init__.py:754
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Unesite celi broj između -32,768 i 32,767."
-#: forms/__init__.py:708
+#: oldforms/__init__.py:764
msgid "Enter a positive number."
msgstr "Unesite pozitivan broj."
-#: forms/__init__.py:717
+#: oldforms/__init__.py:774
msgid "Enter a whole number between 0 and 32,767."
msgstr "Unesite celi broj između 0 i 32,767."
-#: template/defaultfilters.py:379
+#: template/defaultfilters.py:698
msgid "yes,no,maybe"
msgstr "da,ne,možda"
+#: template/defaultfilters.py:729
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d bajt"
+msgstr[1] "%(size)d bajta"
+msgstr[2] "%(size)d bajtova"
+
+#: template/defaultfilters.py:731
+#, python-format
+msgid "%.1f KB"
+msgstr ""
+
+#: template/defaultfilters.py:733
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: template/defaultfilters.py:734
+#, python-format
+msgid "%.1f GB"
+msgstr ""
+
+#: utils/dateformat.py:41
+msgid "p.m."
+msgstr "popodne"
+
+#: utils/dateformat.py:42
+msgid "a.m."
+msgstr "prepodne"
+
+#: utils/dateformat.py:47
+msgid "PM"
+msgstr "popodne"
+
+#: utils/dateformat.py:48
+msgid "AM"
+msgstr "prepodne"
+
+#: utils/dateformat.py:97
+msgid "midnight"
+msgstr "ponoć"
+
+#: utils/dateformat.py:99
+msgid "noon"
+msgstr "podne"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Ponedeljak"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Utorak"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Sreda"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Četvrtak"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Petak"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Subota"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Nedelja"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "Pon"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "Uto"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "Sre"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "Čet"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "Pet"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "Sub"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "Ned"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "Januar"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "Februar"
+
+#: utils/dates.py:18
+#: utils/dates.py:31
+msgid "March"
+msgstr "Mart"
+
+#: utils/dates.py:18
+#: utils/dates.py:31
+msgid "April"
+msgstr "April"
+
+#: utils/dates.py:18
+#: utils/dates.py:31
+msgid "May"
+msgstr "Maj"
+
+#: utils/dates.py:18
+#: utils/dates.py:31
+msgid "June"
+msgstr "Jun"
+
+#: utils/dates.py:19
+#: utils/dates.py:31
+msgid "July"
+msgstr "Jul"
+
+#: utils/dates.py:19
+msgid "August"
+msgstr "Avgust"
+
+#: utils/dates.py:19
+msgid "September"
+msgstr "Septembar"
+
+#: utils/dates.py:19
+msgid "October"
+msgstr "Oktobar"
+
+#: utils/dates.py:19
+msgid "November"
+msgstr "Novembar"
+
+#: utils/dates.py:20
+msgid "December"
+msgstr "Decembar"
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr "jan"
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr "feb"
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr "mar"
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr "apr"
+
+#: utils/dates.py:23
+msgid "may"
+msgstr "maj"
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr "jun"
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr "jul"
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr "avg"
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr "sep"
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr "okt"
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr "nov"
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr "dec"
+
+#: utils/dates.py:31
+msgid "Jan."
+msgstr "Jan."
+
+#: utils/dates.py:31
+msgid "Feb."
+msgstr "Feb."
+
+#: utils/dates.py:32
+msgid "Aug."
+msgstr "Avg."
+
+#: utils/dates.py:32
+msgid "Sept."
+msgstr "Sept."
+
+#: utils/dates.py:32
+msgid "Oct."
+msgstr "Okt."
+
+#: utils/dates.py:32
+msgid "Nov."
+msgstr "Nov."
+
+#: utils/dates.py:32
+msgid "Dec."
+msgstr "Dec."
+
+#: utils/text.py:128
+msgid "or"
+msgstr "ili"
+
+#: utils/timesince.py:21
+msgid "year"
+msgid_plural "years"
+msgstr[0] "godina"
+msgstr[1] "godine"
+msgstr[2] "godina"
+
+#: utils/timesince.py:22
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mesec"
+msgstr[1] "meseca"
+msgstr[2] "meseci"
+
+#: utils/timesince.py:23
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "nedelja"
+msgstr[1] "nedelje"
+msgstr[2] "nedelja"
+
+#: utils/timesince.py:24
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dan"
+msgstr[1] "dana"
+msgstr[2] "dana"
+
+#: utils/timesince.py:25
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "sat"
+msgstr[1] "sata"
+msgstr[2] "sati"
+
+#: utils/timesince.py:26
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minut"
+msgstr[1] "munuta"
+msgstr[2] "minuta"
+
+#: utils/timesince.py:46
+msgid "minutes"
+msgstr "minuta"
+
+#: utils/timesince.py:51
+#, python-format
+msgid "%(number)d %(type)s"
+msgstr "%(type)s: %(number)d"
+
+#: utils/timesince.py:57
+#, python-format
+msgid ", %(number)d %(type)s"
+msgstr ", %(type)s: %(number)d"
+
+#: utils/translation/trans_real.py:401
+msgid "DATE_FORMAT"
+msgstr "D, d.m.Y."
+
+#: utils/translation/trans_real.py:402
+msgid "DATETIME_FORMAT"
+msgstr "d.m.Y. H:i:s"
+
+#: utils/translation/trans_real.py:403
+msgid "TIME_FORMAT"
+msgstr "H:i:s"
+
+#: utils/translation/trans_real.py:419
+msgid "YEAR_MONTH_FORMAT"
+msgstr "m.Y."
+
+#: utils/translation/trans_real.py:420
+msgid "MONTH_DAY_FORMAT"
+msgstr "d.m."
+
+#: views/generic/create_update.py:129
+#, python-format
+msgid "The %(verbose_name)s was created successfully."
+msgstr "%(verbose_name)s uspešno kreiran."
+
+#: views/generic/create_update.py:172
+#, python-format
+msgid "The %(verbose_name)s was updated successfully."
+msgstr "%(verbose_name)s uspešno promenjen."
+
+#: views/generic/create_update.py:214
+#, python-format
+msgid "The %(verbose_name)s was deleted."
+msgstr "%(verbose_name)s je obrisan."
+
+#~ msgid "Added %s."
+#~ msgstr "Dodat %s"
+#~ msgid "Deleted %s."
+#~ msgstr "Obrisan %s."
+#~ msgid "Have you forgotten your password?"
+#~ msgstr ""
+#~ "Da li ste zaboravili vašu lozinku??"
+#~ msgid "Ordering"
+#~ msgstr "Redosled"
+#~ msgid "Use '[algo]$[salt]$[hexdigest]'"
+#~ msgstr "Koristite '[algo]$[salt]$[hexdigest]'"
+#~ msgid "Separate multiple IDs with commas."
+#~ msgstr "Odvojite višestruke ID-ove zarezima."
#~ msgid "Comment"
#~ msgstr "Komentar"
#~ msgid "Comments"
diff --git a/django/conf/locale/sr/LC_MESSAGES/djangojs.mo b/django/conf/locale/sr/LC_MESSAGES/djangojs.mo
index 5713185742..1de89774d7 100644
Binary files a/django/conf/locale/sr/LC_MESSAGES/djangojs.mo and b/django/conf/locale/sr/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/djangojs.po b/django/conf/locale/sr/LC_MESSAGES/djangojs.po
index 65a17757f7..c1338be4bd 100644
--- a/django/conf/locale/sr/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/sr/LC_MESSAGES/djangojs.po
@@ -7,15 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-09 11:51+0100\n"
-"PO-Revision-Date: 2007-02-20 18:51+0100\n"
-"Last-Translator: Petar Marić \n"
-"Language-Team: Nesh & Petar \n"
+"POT-Creation-Date: 2008-07-29 12:07+0200\n"
+"PO-Revision-Date: 2008-07-29 12:53+0100\n"
+"Last-Translator: Nebojsa Djordjevic \n"
+"Language-Team: Nesh & Petar \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Country: YUGOSLAVIA\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Poedit-Language: Serbian\n"
+"X-Poedit-SourceCharset: utf-8\n"
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
@@ -47,63 +49,72 @@ msgstr "Izaberite potrebno i kliknite"
msgid "Clear all"
msgstr "Obrišite sve"
-#: contrib/admin/media/js/dateparse.js:26
#: contrib/admin/media/js/calendar.js:24
+#: contrib/admin/media/js/dateparse.js:32
msgid "January February March April May June July August September October November December"
msgstr "Januar Februar Mart April Maj Jun Jul Avgust Septembar Oktobar Novembar Decembar"
-#: contrib/admin/media/js/dateparse.js:27
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Nedelja Ponedeljak Utorak Sreda Četvrtak Petak Subota"
-
#: contrib/admin/media/js/calendar.js:25
msgid "S M T W T F S"
msgstr "N P U S Č P S"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Nedelja Ponedeljak Utorak Sreda Četvrtak Petak Subota"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+msgid "Show"
+msgstr "Prikaži"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+msgid "Hide"
+msgstr "Sakrij"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
msgid "Now"
msgstr "Sada"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
msgid "Clock"
msgstr "Sat"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
msgid "Choose a time"
msgstr "Izaberite vreme"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
msgid "Midnight"
msgstr "Ponoć"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "6 a.m."
msgstr "6 sati"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Noon"
msgstr "Podne"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
msgid "Cancel"
msgstr "Poništi"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
msgid "Today"
msgstr "Danas"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
msgid "Calendar"
msgstr "Kalendar"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
msgid "Yesterday"
msgstr "Juče"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
msgid "Tomorrow"
msgstr "Sutra"
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index acb08754a5..f6cf8c22c5 100644
Binary files a/django/conf/locale/sv/LC_MESSAGES/django.mo and b/django/conf/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po
index b6ef3c3a6d..32d04d4b14 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-26 10:58+0200\n"
+"POT-Creation-Date: 2008-07-27 21:27+0200\n"
"PO-Revision-Date: 2008-05-26 11:15+0200\n"
"Last-Translator: Ludvig Ericson \n"
"Language-Team: Django I18N \n"
@@ -17,191 +17,199 @@ msgstr ""
"X-Poedit-Language: Swedish\n"
"X-Poedit-Country: SWEDEN\n"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Arabic"
msgstr "Arabiska"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Bengali"
msgstr "Bengaliska"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Bulgarian"
msgstr "Bulgariska"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Catalan"
msgstr "Katalanska"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Czech"
msgstr "Tjeckiska"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Welsh"
msgstr "Walesiska"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Danish"
msgstr "Danska"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "German"
msgstr "Tyska"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Greek"
msgstr "Grekiska"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "English"
msgstr "Engelska"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Spanish"
msgstr "Spanska"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
+msgid "Estonian"
+msgstr "Estländska"
+
+#: conf/global_settings.py:56
msgid "Argentinean Spanish"
msgstr "Argentisk Spanska"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:57
msgid "Basque"
msgstr "Baskiska"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:58
msgid "Persian"
msgstr "Persiska"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:59
msgid "Finnish"
msgstr "Finska"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:60
msgid "French"
msgstr "Franska"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:61
msgid "Irish"
msgstr "Irländska"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:62
msgid "Galician"
msgstr "Galisiska"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:63
msgid "Hungarian"
msgstr "Ungerska"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:64
msgid "Hebrew"
msgstr "Hebreiska"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:65
msgid "Croatian"
msgstr "Kroatiska"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:66
msgid "Icelandic"
msgstr "Isländska"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:67
msgid "Italian"
msgstr "Italienska"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:68
msgid "Japanese"
msgstr "Japanska"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:69
msgid "Georgian"
msgstr "Georgiska"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:70
msgid "Korean"
msgstr "Koreanska"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:71
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:73
msgid "Latvian"
msgstr "Lettiska"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:74
+msgid "Lithuanian"
+msgstr "Lettiska"
+
+#: conf/global_settings.py:75
msgid "Macedonian"
msgstr "Makedonska"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:76
msgid "Dutch"
msgstr "Holländska"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:77
msgid "Norwegian"
msgstr "Norska"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:78
msgid "Polish"
msgstr "Polska"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:79
msgid "Portugese"
msgstr "Portugisiska"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:80
msgid "Brazilian Portuguese"
msgstr "Brasiliensk portugisiska"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:81
msgid "Romanian"
msgstr "Rumänska"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:82
msgid "Russian"
msgstr "Ryska"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:83
msgid "Slovak"
msgstr "Slovakiska"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:84
msgid "Slovenian"
msgstr "Slovenska"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:85
msgid "Serbian"
msgstr "Serbiska"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:86
msgid "Swedish"
msgstr "Svenska"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:87
msgid "Tamil"
msgstr "Tamilska"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:88
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:89
msgid "Turkish"
msgstr "Turkiska"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:90
msgid "Ukrainian"
msgstr "Ukrainska"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Simplified Chinese"
msgstr "Förenklad Kinesiska"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Traditional Chinese"
msgstr "Traditionell Kinesiska"
@@ -239,49 +247,206 @@ msgstr "Denna månad"
msgid "This year"
msgstr "Detta år"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Yes"
msgstr "Ja"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "No"
msgstr "Nej"
-#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:379
#: oldforms/__init__.py:592
msgid "Unknown"
msgstr "Okänt"
-#: contrib/admin/models.py:18
+#: contrib/admin/models.py:19
msgid "action time"
msgstr "händelsetid"
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
msgid "object id"
msgstr "objektets id"
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
msgid "object repr"
msgstr "objektets beskrivning"
-#: contrib/admin/models.py:23
+#: contrib/admin/models.py:24
msgid "action flag"
msgstr "händelseflagga"
-#: contrib/admin/models.py:24
+#: contrib/admin/models.py:25
msgid "change message"
msgstr "ändra meddelande"
-#: contrib/admin/models.py:27
+#: contrib/admin/models.py:28
msgid "log entry"
msgstr "loggpost"
-#: contrib/admin/models.py:28
+#: contrib/admin/models.py:29
msgid "log entries"
msgstr "loggposter"
+#: contrib/admin/options.py:161 contrib/admin/options.py:180
+msgid "None"
+msgstr "Inget"
+
+#: contrib/admin/options.py:347 contrib/auth/admin.py:37
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" lades till."
+
+#: contrib/admin/options.py:351 contrib/admin/options.py:419
+#: contrib/auth/admin.py:42
+msgid "You may edit it again below."
+msgstr "Du kan ändra det igen nedanför."
+
+#: contrib/admin/options.py:361 contrib/admin/options.py:428
+#, python-format
+msgid "You may add another %s below."
+msgstr "Du kan lägga till ytterligare %s nedanför."
+
+#: contrib/admin/options.py:395
+#, python-format
+msgid "Changed %s."
+msgstr "Ändrade %s."
+
+#: contrib/admin/options.py:395 contrib/admin/options.py:405
+#: core/validators.py:279 db/models/manipulators.py:305
+msgid "and"
+msgstr "och"
+
+#: contrib/admin/options.py:400
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "Lade till %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:404
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "Ändrade %(list)s på %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:409
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "Tog bort %(name)s \"%(object)s\"."
+
+#: contrib/admin/options.py:414
+msgid "No fields changed."
+msgstr "Inga fält ändrade."
+
+#: contrib/admin/options.py:417
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" ändrades."
+
+#: contrib/admin/options.py:425
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"%(name)s \"%(obj)s\" lades till. Du kan redigera objektet igen nedanför."
+
+#: contrib/admin/options.py:506
+#, python-format
+msgid "Add %s"
+msgstr "Lägg till %s"
+
+#: contrib/admin/options.py:568
+#, python-format
+msgid "Change %s"
+msgstr "Ändra %s"
+
+#: contrib/admin/options.py:598
+msgid "Database error"
+msgstr "Databasfel"
+
+#: contrib/admin/options.py:647
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)s \"%(obj)s\" togs bort."
+
+#: contrib/admin/options.py:653
+msgid "Are you sure?"
+msgstr "Är du säker?"
+
+#: contrib/admin/options.py:680
+#, python-format
+msgid "Change history: %s"
+msgstr "Ändringshistorik: %s"
+
+#: contrib/admin/sites.py:18 contrib/admin/views/decorators.py:16
+#: contrib/auth/forms.py:70 contrib/comments/views/comments.py:56
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Var god ange ett korrekt användarnamn och lösenord. Tänk på att skilja "
+"mellan gemener och versaler."
+
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:68
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Du måste logga in igen eftersom din session har förfallit. Oroa dig inte: "
+"Din data har sparats."
+
+#: contrib/admin/sites.py:240 contrib/admin/views/decorators.py:75
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Det verkar som att din webläsare inte är konfigurerad att acceptera cookies. "
+"Aktivera cookies, ladda om denna sida och försök igen."
+
+#: contrib/admin/sites.py:254 contrib/admin/sites.py:260
+#: contrib/admin/views/decorators.py:92
+msgid "Usernames cannot contain the '@' character."
+msgstr "Användarnamn får inte innehålla '@'-tecknet."
+
+#: contrib/admin/sites.py:257 contrib/admin/views/decorators.py:88
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Din e-postadress är inte ditt användarnamn. Försök med '%s' istället."
+
+#: contrib/admin/sites.py:325
+msgid "Site administration"
+msgstr "Webbplatsadministration"
+
+#: contrib/admin/sites.py:347 contrib/admin/templates/admin/login.html:27
+#: contrib/admin/views/decorators.py:30
+msgid "Log in"
+msgstr "Logga in"
+
+#: contrib/admin/util.py:126
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Ett eller flera %(fieldname)s i %(name)s: %(obj)s"
+
+#: contrib/admin/util.py:131
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Ett eller flera %(fieldname)s i %(name)s:"
+
+#: contrib/admin/widgets.py:65
+msgid "Date:"
+msgstr "Datum:"
+
+#: contrib/admin/widgets.py:65
+msgid "Time:"
+msgstr "Tid:"
+
+#: contrib/admin/widgets.py:89
+msgid "Currently:"
+msgstr "Aktuell:"
+
+#: contrib/admin/widgets.py:89
+msgid "Change:"
+msgstr "Ändra:"
+
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
msgid "Page not found"
@@ -292,17 +457,17 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Vi beklagar men den begärda sidan hittades inte."
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:37
-#: contrib/admin/templates/admin/change_form.html:12
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:4
-#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
msgid "Home"
@@ -328,22 +493,28 @@ msgstr ""
"Ett fel har uppstått. Administratören har meddelats via e-post och felet bör "
"vara åtgärdat inom kort. Tack för visat tålamod."
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:25
msgid "Welcome,"
msgstr "Välkommen,"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:25
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Documentation"
msgstr "Dokumentation"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:45
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:13
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Change password"
msgstr "Ändra lösenord"
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/comments/templates/comments/form.html:6
msgid "Log out"
msgstr "Logga ut"
@@ -356,46 +527,43 @@ msgstr "Django webbplatsadministration"
msgid "Django administration"
msgstr "Django-administration"
-#: contrib/admin/templates/admin/change_form.html:14
-#: contrib/admin/templates/admin/index.html:28
+#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/index.html:29
msgid "Add"
msgstr "Lägg till"
-#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/change_form.html:26
+#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Historik"
-#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/change_form.html:27
msgid "View on site"
msgstr "Visa på webbplats"
-#: contrib/admin/templates/admin/change_form.html:31
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:37
+#: contrib/admin/templates/admin/auth/user/change_password.html:22
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Rätta till felet nedan."
msgstr[1] "Rätta till felen nedan."
-#: contrib/admin/templates/admin/change_form.html:49
-msgid "Ordering"
-msgstr "Sortering"
-
-#: contrib/admin/templates/admin/change_form.html:52
-msgid "Order:"
-msgstr "Sortera:"
-
-#: contrib/admin/templates/admin/change_list.html:11
+#: contrib/admin/templates/admin/change_list.html:16
#, python-format
msgid "Add %(name)s"
msgstr "Lägg till %(name)s"
-#: contrib/admin/templates/admin/delete_confirmation.html:8
+#: contrib/admin/templates/admin/change_list.html:26
+msgid "Filter"
+msgstr "Filter"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:9
#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
msgid "Delete"
msgstr "Ta bort"
-#: contrib/admin/templates/admin/delete_confirmation.html:13
+#: contrib/admin/templates/admin/delete_confirmation.html:15
#, python-format
msgid ""
"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -406,7 +574,7 @@ msgstr ""
"relaterade objekt togs bort, men ditt konto har inte rättigheter att ta bort "
"följande objekttyper:"
-#: contrib/admin/templates/admin/delete_confirmation.html:20
+#: contrib/admin/templates/admin/delete_confirmation.html:22
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -415,7 +583,7 @@ msgstr ""
"Är du säker på att du vill ta bort %(object_name)s \"%(escaped_object)s\"? "
"Följande relaterade objekt kommer att tas bort:"
-#: contrib/admin/templates/admin/delete_confirmation.html:25
+#: contrib/admin/templates/admin/delete_confirmation.html:27
msgid "Yes, I'm sure"
msgstr "Ja, jag är säker"
@@ -424,41 +592,37 @@ msgstr "Ja, jag är säker"
msgid " By %(filter_title)s "
msgstr " Av %(filter_title)s "
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filter"
-
-#: contrib/admin/templates/admin/index.html:17
+#: contrib/admin/templates/admin/index.html:18
#, python-format
msgid "Models available in the %(name)s application."
msgstr "Modeller tillgängliga i applikationen %(name)s."
-#: contrib/admin/templates/admin/index.html:18
+#: contrib/admin/templates/admin/index.html:19
#, python-format
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/index.html:34
+#: contrib/admin/templates/admin/index.html:35
msgid "Change"
msgstr "Ändra"
-#: contrib/admin/templates/admin/index.html:44
+#: contrib/admin/templates/admin/index.html:45
msgid "You don't have permission to edit anything."
msgstr "Du har inte rättigheter att redigera något."
-#: contrib/admin/templates/admin/index.html:52
+#: contrib/admin/templates/admin/index.html:53
msgid "Recent Actions"
msgstr "Senaste Händelser"
-#: contrib/admin/templates/admin/index.html:53
+#: contrib/admin/templates/admin/index.html:54
msgid "My Actions"
msgstr "Mina händelser"
-#: contrib/admin/templates/admin/index.html:57
+#: contrib/admin/templates/admin/index.html:58
msgid "None available"
msgstr "Inga tillgängliga"
-#: contrib/admin/templates/admin/invalid_setup.html:8
+#: 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 "
@@ -467,39 +631,34 @@ msgstr ""
"Någonting är fel med din databasinstallation. Se till att de rätta "
"databastabellerna har skapats och att databasen är läsbar av rätt användare."
-#: contrib/admin/templates/admin/login.html:17
+#: contrib/admin/templates/admin/login.html:19
#: contrib/comments/templates/comments/form.html:6
#: contrib/comments/templates/comments/form.html:8
msgid "Username:"
msgstr "Användarnamn:"
-#: contrib/admin/templates/admin/login.html:20
+#: contrib/admin/templates/admin/login.html:22
#: contrib/comments/templates/comments/form.html:8
msgid "Password:"
msgstr "Lösenord:"
-#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:31
-msgid "Log in"
-msgstr "Logga in"
-
-#: contrib/admin/templates/admin/object_history.html:17
+#: contrib/admin/templates/admin/object_history.html:16
msgid "Date/time"
msgstr "Datum tid"
-#: contrib/admin/templates/admin/object_history.html:18
+#: contrib/admin/templates/admin/object_history.html:17
msgid "User"
msgstr "Användare"
-#: contrib/admin/templates/admin/object_history.html:19
+#: contrib/admin/templates/admin/object_history.html:18
msgid "Action"
msgstr "Händelse"
-#: contrib/admin/templates/admin/object_history.html:25
+#: contrib/admin/templates/admin/object_history.html:24
msgid "DATE_WITH_TIME_FULL"
msgstr "Y-m-d H:i:s"
-#: contrib/admin/templates/admin/object_history.html:35
+#: contrib/admin/templates/admin/object_history.html:32
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
@@ -551,26 +710,29 @@ msgstr ""
"Ange först ett användarnamn och ett lösenord. Efter det kommer du att få "
"fler användaralternativ."
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
+#: contrib/admin/templates/admin/auth/user/add_form.html:13
+#: contrib/auth/forms.py:12 contrib/auth/forms.py:49
msgid "Username"
msgstr "Användarnamn"
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/add_form.html:20
#: contrib/admin/templates/admin/auth/user/change_password.html:33
+#: contrib/auth/forms.py:15 contrib/auth/forms.py:50 contrib/auth/forms.py:166
msgid "Password"
msgstr "Lösenord"
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:38
+#: contrib/admin/templates/admin/auth/user/add_form.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/auth/forms.py:167
msgid "Password (again)"
msgstr "Lösenord (igen)"
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: 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 "Fyll i samma lösenord som ovan för verifiering."
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:26
#, python-format
msgid "Enter a new password for the user %(username)s."
msgstr "Ange nytt lösenord för användare %(username)s."
@@ -652,23 +814,23 @@ msgstr "Tack för att du spenderade lite kvalitetstid med webbplatsen idag."
msgid "Log in again"
msgstr "Logga in igen"
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_form.html:5
-#: contrib/admin/templates/registration/password_change_form.html:9
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
msgid "Password change"
msgstr "Ändra lösenord"
-#: contrib/admin/templates/registration/password_change_done.html:5
-#: contrib/admin/templates/registration/password_change_done.html:9
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
msgid "Password change successful"
msgstr "Lösenordet ändrades"
-#: contrib/admin/templates/registration/password_change_done.html:11
+#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
msgstr "Ditt lösenord har ändrats."
-#: contrib/admin/templates/registration/password_change_form.html:11
+#: 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."
@@ -676,19 +838,19 @@ msgstr ""
"Var god fyll i ditt gamla lösenord för säkerhets skull och skriv sedan in "
"ditt nya lösenord två gånger så vi kan kontrollera att du skrev det rätt."
-#: contrib/admin/templates/registration/password_change_form.html:16
+#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
msgstr "Gammalt lösenord:"
-#: contrib/admin/templates/registration/password_change_form.html:18
+#: contrib/admin/templates/registration/password_change_form.html:19
msgid "New password:"
msgstr "Nytt lösenord:"
-#: contrib/admin/templates/registration/password_change_form.html:20
+#: contrib/admin/templates/registration/password_change_form.html:21
msgid "Confirm password:"
msgstr "Bekräfta lösenord:"
-#: contrib/admin/templates/registration/password_change_form.html:22
+#: contrib/admin/templates/registration/password_change_form.html:23
msgid "Change my password"
msgstr "Ändra mitt lösenord"
@@ -740,345 +902,230 @@ msgid "Thanks for using our site!"
msgstr "Tack för att du använder vår webbplats!"
#: contrib/admin/templates/registration/password_reset_email.html:15
-#, python-format
-msgid "The %(site_name)s team"
-msgstr "%(site_name)s-teamet"
-
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"Har du glömt ditt lösenord? Fyll i din e-postadress nedan så nollställer vi "
-"ditt lösenord och skickar det nya till dig via e-post."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "E-postadress:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Nollställ mitt lösenord"
-
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Datum:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Tid:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Aktuell:"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Ändra:"
-
-#: contrib/admin/templatetags/admin_list.py:257
-msgid "All dates"
-msgstr "Alla datum"
-
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" lades till."
-
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
-#: contrib/admin/views/main.py:356
-msgid "You may edit it again below."
-msgstr "Du kan ändra det igen nedanför."
-
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr "Lägg till användare"
-
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
-msgstr "Lösenordet ändrades."
-
-#: contrib/admin/views/auth.py:65
-#, python-format
-msgid "Change password: %s"
-msgstr "Ändra lösenord: %s"
-
-#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Var god ange ett korrekt användarnamn och lösenord. Tänk på att skilja "
-"mellan gemener och versaler."
-
-#: contrib/admin/views/decorators.py:69
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"Du måste logga in igen eftersom din session har förfallit. Oroa dig inte: "
-"Din data har sparats."
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "%(site_name)s-teamet"
-#: contrib/admin/views/decorators.py:76
+#: contrib/admin/templates/registration/password_reset_form.html:12
msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
msgstr ""
-"Det verkar som att din webläsare inte är konfigurerad att acceptera cookies. "
-"Aktivera cookies, ladda om denna sida och försök igen."
+"Har du glömt ditt lösenord? Fyll i din e-postadress nedan så nollställer vi "
+"ditt lösenord och skickar det nya till dig via e-post."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "E-postadress:"
-#: contrib/admin/views/decorators.py:89
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Nollställ mitt lösenord"
+
+#: contrib/admin/templatetags/admin_list.py:257
+msgid "All dates"
+msgstr "Alla datum"
+
+#: contrib/admin/views/main.py:65
#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Din e-postadress är inte ditt användarnamn. Försök med '%s' istället."
+msgid "Select %s"
+msgstr "Välj %s"
-#: contrib/admin/views/decorators.py:93
-msgid "Usernames cannot contain the '@' character."
-msgstr "Användarnamn får inte innehålla '@'-tecknet."
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s to change"
+msgstr "Välj %s att ändra"
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
-#: contrib/admin/views/doc.py:52
+#: contrib/admindocs/views.py:53 contrib/admindocs/views.py:55
+#: contrib/admindocs/views.py:57
msgid "tag:"
msgstr "tagg:"
-#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
-#: contrib/admin/views/doc.py:83
+#: contrib/admindocs/views.py:87 contrib/admindocs/views.py:89
+#: contrib/admindocs/views.py:91
msgid "filter:"
msgstr "filter:"
-#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
-#: contrib/admin/views/doc.py:141
+#: contrib/admindocs/views.py:153 contrib/admindocs/views.py:155
+#: contrib/admindocs/views.py:157
msgid "view:"
msgstr "vy:"
-#: contrib/admin/views/doc.py:166
+#: contrib/admindocs/views.py:187
#, python-format
msgid "App %r not found"
msgstr "Applikation %r hittades inte"
-#: contrib/admin/views/doc.py:173
+#: contrib/admindocs/views.py:194
#, python-format
-msgid "Model %(name)r not found in app %(label)r"
-msgstr "Modell %(name)r hittades inte i applikation %(label)r"
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr "Modell %(model_name)r hittades inte i applikation %(app_label)r"
-#: contrib/admin/views/doc.py:185
+#: contrib/admindocs/views.py:206
#, python-format
-msgid "the related `%(label)s.%(type)s` object"
-msgstr "det relaterade `%(label)s.%(type)s`-objektet"
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "det relaterade `%(app_label)s.%(data_type)s`-objektet"
-#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
-#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
msgid "model:"
msgstr "modell:"
-#: contrib/admin/views/doc.py:216
+#: contrib/admindocs/views.py:237
#, python-format
-msgid "related `%(label)s.%(name)s` objects"
-msgstr "relaterade `%(label)s.%(name)s`-objekt"
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "relaterade `%(app_label)s.%(object_name)s`-objekt"
-#: contrib/admin/views/doc.py:221
+#: contrib/admindocs/views.py:242
#, python-format
msgid "all %s"
msgstr "alla %s"
-#: contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:247
#, python-format
msgid "number of %s"
msgstr "antal %s"
-#: contrib/admin/views/doc.py:231
+#: contrib/admindocs/views.py:253
#, python-format
msgid "Fields on %s objects"
msgstr "Fält på %s objekt"
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
-#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
-#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
+#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:328
+#: contrib/admindocs/views.py:330 contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:337 contrib/admindocs/views.py:339
msgid "Integer"
msgstr "Heltal"
-#: contrib/admin/views/doc.py:294
+#: contrib/admindocs/views.py:318
msgid "Boolean (Either True or False)"
msgstr "Boolesk (antingen True eller False)"
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
+#: contrib/admindocs/views.py:319 contrib/admindocs/views.py:338
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Sträng (upp till %(max_length)s)"
-#: contrib/admin/views/doc.py:296
+#: contrib/admindocs/views.py:320
msgid "Comma-separated integers"
msgstr "Komma-separerade heltal"
-#: contrib/admin/views/doc.py:297
+#: contrib/admindocs/views.py:321
msgid "Date (without time)"
msgstr "Datum (utan tid)"
-#: contrib/admin/views/doc.py:298
+#: contrib/admindocs/views.py:322
msgid "Date (with time)"
msgstr "Datum (med tid)"
-#: contrib/admin/views/doc.py:299
+#: contrib/admindocs/views.py:323
msgid "Decimal number"
msgstr "Decimaltal"
-#: contrib/admin/views/doc.py:300
+#: contrib/admindocs/views.py:324
msgid "E-mail address"
msgstr "E-postadress"
-#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
-#: contrib/admin/views/doc.py:305
+#: contrib/admindocs/views.py:325 contrib/admindocs/views.py:326
+#: contrib/admindocs/views.py:329
msgid "File path"
msgstr "Sökväg till fil"
-#: contrib/admin/views/doc.py:303
+#: contrib/admindocs/views.py:327
msgid "Floating point number"
msgstr "Flyttal"
-#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89
+#: contrib/admindocs/views.py:331 contrib/comments/models.py:89
msgid "IP address"
msgstr "IP-adress"
-#: contrib/admin/views/doc.py:309
+#: contrib/admindocs/views.py:333
msgid "Boolean (Either True, False or None)"
msgstr "Boolesk (antingen True, False eller None)"
-#: contrib/admin/views/doc.py:310
+#: contrib/admindocs/views.py:334
msgid "Relation to parent model"
msgstr "Relation till förälder-modell"
-#: contrib/admin/views/doc.py:311
+#: contrib/admindocs/views.py:335
msgid "Phone number"
msgstr "Telefonnummer"
-#: contrib/admin/views/doc.py:316
+#: contrib/admindocs/views.py:340
msgid "Text"
msgstr "Text"
-#: contrib/admin/views/doc.py:317
+#: contrib/admindocs/views.py:341
msgid "Time"
msgstr "Tid"
-#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:8
+#: contrib/admindocs/views.py:342 contrib/flatpages/models.py:8
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:319
+#: contrib/admindocs/views.py:343
msgid "U.S. state (two uppercase letters)"
msgstr "Delstat i USA (två versaler)"
-#: contrib/admin/views/doc.py:320
+#: contrib/admindocs/views.py:344
msgid "XML text"
msgstr "XML-text"
-#: contrib/admin/views/doc.py:346
+#: contrib/admindocs/views.py:370
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s verkar inte vara ett urlpattern-objekt"
-#: contrib/admin/views/main.py:233
-msgid "Site administration"
-msgstr "Webbplatsadministration"
-
-#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
-#, python-format
-msgid "You may add another %s below."
-msgstr "Du kan lägga till ytterligare %s nedanför."
-
-#: contrib/admin/views/main.py:298
-#, python-format
-msgid "Add %s"
-msgstr "Lägg till %s"
-
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Added %s."
-msgstr "Lade till %s."
-
-#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
-#: contrib/admin/views/main.py:348 core/validators.py:283
-#: db/models/manipulators.py:309
-msgid "and"
-msgstr "och"
+#: contrib/auth/admin.py:17
+msgid "Personal info"
+msgstr "Personlig information"
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Changed %s."
-msgstr "Ändrade %s."
+#: contrib/auth/admin.py:18
+msgid "Permissions"
+msgstr "Rättigheter"
-#: contrib/admin/views/main.py:348
-#, python-format
-msgid "Deleted %s."
-msgstr "Tog bort %s."
+#: contrib/auth/admin.py:19
+msgid "Important dates"
+msgstr "Viktiga datum"
-#: contrib/admin/views/main.py:351
-msgid "No fields changed."
-msgstr "Inga fält ändrade."
+#: contrib/auth/admin.py:20
+msgid "Groups"
+msgstr "Grupper"
-#: contrib/admin/views/main.py:354
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ändrades."
+#: contrib/auth/admin.py:47
+msgid "Add user"
+msgstr "Lägg till användare"
-#: contrib/admin/views/main.py:362
-#, python-format
+#: contrib/auth/forms.py:13 contrib/auth/models.py:134
msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
+"digits and underscores)."
msgstr ""
-"%(name)s \"%(obj)s\" lades till. Du kan redigera objektet igen nedanför."
-
-#: contrib/admin/views/main.py:400
-#, python-format
-msgid "Change %s"
-msgstr "Ändra %s"
-
-#: contrib/admin/views/main.py:487
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Ett eller flera %(fieldname)s i %(name)s: %(obj)s"
-
-#: contrib/admin/views/main.py:492
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Ett eller flera %(fieldname)s i %(name)s:"
-
-#: contrib/admin/views/main.py:524
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" togs bort."
-
-#: contrib/admin/views/main.py:527
-msgid "Are you sure?"
-msgstr "Är du säker?"
-
-#: contrib/admin/views/main.py:549
-#, python-format
-msgid "Change history: %s"
-msgstr "Ändringshistorik: %s"
+"Obligatorisk. 30 tecken eller färre. Endast bokstäver, siffror eller "
+"understreck."
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s"
-msgstr "Välj %s"
+#: contrib/auth/forms.py:14 core/validators.py:72
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Detta värde får endast innehålla bokstäver, siffror och understreck."
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s to change"
-msgstr "Välj %s att ändra"
+#: contrib/auth/forms.py:16
+msgid "Password confirmation"
+msgstr "Lösenordsbekräftelse"
-#: contrib/admin/views/main.py:765
-msgid "Database error"
-msgstr "Databasfel"
+#: contrib/auth/forms.py:28
+msgid "A user with that username already exists."
+msgstr "En användare med det användarnamnet finns redan."
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
+#: contrib/auth/forms.py:34 contrib/auth/forms.py:153
+#: contrib/auth/forms.py:178
msgid "The two password fields didn't match."
msgstr "De två lösenordsfälten stämde inte överens."
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "En användare med det användarnamnet finns redan."
+#: contrib/auth/forms.py:72 contrib/comments/views/comments.py:58
+msgid "This account is inactive."
+msgstr "Detta konto är inaktivt."
-#: contrib/auth/forms.py:53
+#: contrib/auth/forms.py:77 contrib/comments/views/comments.py:49
msgid ""
"Your Web browser doesn't appear to have cookies enabled. Cookies are "
"required for logging in."
@@ -1086,11 +1133,11 @@ msgstr ""
"Din webbläsare verkar inte tillåta cookies. Cookies behövs för att kunna "
"logga in."
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
-msgstr "Detta konto är inaktivt."
+#: contrib/auth/forms.py:90
+msgid "E-mail"
+msgstr "E-postadress"
-#: contrib/auth/forms.py:84
+#: contrib/auth/forms.py:99
msgid ""
"That e-mail address doesn't have an associated user account. Are you sure "
"you've registered?"
@@ -1098,16 +1145,24 @@ msgstr ""
"Den e-postadressen är inte associerad med något användarkonto. Är du säker "
"på att du har registrerat dig?"
-#: contrib/auth/forms.py:107
+#: contrib/auth/forms.py:124
#, python-format
msgid "Password reset on %s"
-msgstr "Lösenord nollställt: %s"
+msgstr "Lösenord nollställt för %s"
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr "De två 'nytt lösenord'-fälten stämde inte överens."
+#: contrib/auth/forms.py:131
+msgid "Old password"
+msgstr "Gammalt lösenord"
-#: contrib/auth/forms.py:124
+#: contrib/auth/forms.py:132
+msgid "New password"
+msgstr "Nytt lösenord"
+
+#: contrib/auth/forms.py:133
+msgid "New password confirmation"
+msgstr "Bekräfta nytt lösenord"
+
+#: contrib/auth/forms.py:145
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr "Ditt gamla lösenord var felaktigt ifyllt. Var vänlig fyll i det igen."
@@ -1131,39 +1186,31 @@ msgstr "rättigheter"
msgid "group"
msgstr "grupp"
-#: contrib/auth/models.py:98 contrib/auth/models.py:141
+#: contrib/auth/models.py:98 contrib/auth/models.py:144
msgid "groups"
msgstr "grupper"
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:134
msgid "username"
msgstr "användarnamn"
-#: contrib/auth/models.py:131
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
-msgstr ""
-"Obligatorisk. 30 tecken eller färre. Endast bokstäver, siffror eller "
-"understreck."
-
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:135
msgid "first name"
msgstr "förnamn"
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:136
msgid "last name"
msgstr "efternamn"
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:137
msgid "e-mail address"
msgstr "e-postadress"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:138
msgid "password"
msgstr "lösenord"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:138
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the change "
"password form."
@@ -1171,31 +1218,31 @@ msgstr ""
"Använd '[algo]$[salt]$[hexdigest]' eller använd Ändra "
"lösenord-formuläret."
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:139
msgid "staff status"
msgstr "personalstatus"
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:139
msgid "Designates whether the user can log into this admin site."
msgstr "Avgör om användaren kan logga in på denna adminsida."
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:140
msgid "active"
msgstr "aktiv"
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:140
msgid ""
"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
msgstr ""
-"Anger om användaren skall betraktas som aktiv. Avmarkera detta istället "
-"för att ta bort konton."
+"Anger om användaren skall betraktas som aktiv. Avmarkera detta istället för "
+"att ta bort konton."
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:141
msgid "superuser status"
msgstr "superanvändare"
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:141
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
@@ -1203,15 +1250,15 @@ msgstr ""
"Anger att denna användare har alla rättigheter utan att uttryckligen "
"tilldela dem."
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:142
msgid "last login"
msgstr "senaste inloggning"
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:143
msgid "date joined"
msgstr "registreringsdatum"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:145
msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
@@ -1219,43 +1266,36 @@ msgstr ""
"Förutom de rättigheterna som utdelas manuellt så kommer användaren dessutom "
"få samma rättigheter som de grupper där han/hon är medlem."
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:146
msgid "user permissions"
msgstr "användarättigheter"
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:150
msgid "user"
msgstr "användare"
-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:151
msgid "users"
msgstr "användare"
-#: contrib/auth/models.py:154
-msgid "Personal info"
-msgstr "Personlig information"
-
-#: contrib/auth/models.py:155
-msgid "Permissions"
-msgstr "Rättigheter"
-
-#: contrib/auth/models.py:156
-msgid "Important dates"
-msgstr "Viktiga datum"
-
-#: contrib/auth/models.py:157
-msgid "Groups"
-msgstr "Grupper"
-
-#: contrib/auth/models.py:316
+#: contrib/auth/models.py:306
msgid "message"
msgstr "meddelande"
-#: contrib/auth/views.py:47
+#: contrib/auth/views.py:49
msgid "Logged out"
msgstr "Utloggad"
-#: contrib/comments/models.py:71 contrib/comments/models.py:176
+#: contrib/auth/views.py:116
+msgid "Password changed successfully."
+msgstr "Lösenordet ändrades."
+
+#: contrib/auth/views.py:122
+#, python-format
+msgid "Change password: %s"
+msgstr "Ändra lösenord: %s"
+
+#: contrib/comments/models.py:71 contrib/comments/models.py:164
msgid "object ID"
msgstr "objektets ID"
@@ -1264,7 +1304,7 @@ msgid "headline"
msgstr "rubrik"
#: contrib/comments/models.py:73 contrib/comments/models.py:95
-#: contrib/comments/models.py:177
+#: contrib/comments/models.py:165
msgid "comment"
msgstr "kommentar"
@@ -1304,11 +1344,11 @@ msgstr "betyg #8"
msgid "is valid rating"
msgstr "är ett giltigt betyg"
-#: contrib/comments/models.py:87 contrib/comments/models.py:179
+#: contrib/comments/models.py:87 contrib/comments/models.py:167
msgid "date/time submitted"
msgstr "skickat datum/tid"
-#: contrib/comments/models.py:88 contrib/comments/models.py:180
+#: contrib/comments/models.py:88 contrib/comments/models.py:168
msgid "is public"
msgstr "är offentlig"
@@ -1328,11 +1368,11 @@ msgstr ""
msgid "comments"
msgstr "kommentarer"
-#: contrib/comments/models.py:140 contrib/comments/models.py:222
+#: contrib/comments/models.py:128 contrib/comments/models.py:199
msgid "Content object"
msgstr "Innehållsobjekt"
-#: contrib/comments/models.py:168
+#: contrib/comments/models.py:156
#, python-format
msgid ""
"Posted by %(user)s at %(date)s\n"
@@ -1347,48 +1387,48 @@ msgstr ""
"\n"
"http://%(domain)s%(url)s"
-#: contrib/comments/models.py:178
+#: contrib/comments/models.py:166
msgid "person's name"
msgstr "personens namn"
-#: contrib/comments/models.py:181
+#: contrib/comments/models.py:169
msgid "ip address"
msgstr "IP-adress"
-#: contrib/comments/models.py:183
+#: contrib/comments/models.py:171
msgid "approved by staff"
msgstr "godkänd av personal"
-#: contrib/comments/models.py:187
+#: contrib/comments/models.py:175
msgid "free comment"
msgstr "fri kommentar"
-#: contrib/comments/models.py:188
+#: contrib/comments/models.py:176
msgid "free comments"
msgstr "fria kommentarer"
-#: contrib/comments/models.py:250
+#: contrib/comments/models.py:227
msgid "score"
msgstr "poäng"
-#: contrib/comments/models.py:251
+#: contrib/comments/models.py:228
msgid "score date"
msgstr "poäng tilldelad"
-#: contrib/comments/models.py:255
+#: contrib/comments/models.py:232
msgid "karma score"
msgstr "karmapoäng"
-#: contrib/comments/models.py:256
+#: contrib/comments/models.py:233
msgid "karma scores"
msgstr "karmapoäng"
-#: contrib/comments/models.py:260
+#: contrib/comments/models.py:237
#, python-format
msgid "%(score)d rating by %(user)s"
msgstr "Betyg %(score)d av %(user)s"
-#: contrib/comments/models.py:277
+#: contrib/comments/models.py:254
#, python-format
msgid ""
"This comment was flagged by %(user)s:\n"
@@ -1399,36 +1439,36 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/models.py:285
+#: contrib/comments/models.py:262
msgid "flag date"
msgstr "flaggdatum"
-#: contrib/comments/models.py:289
+#: contrib/comments/models.py:266
msgid "user flag"
msgstr "användarflagga"
-#: contrib/comments/models.py:290
+#: contrib/comments/models.py:267
msgid "user flags"
msgstr "användarflaggor"
-#: contrib/comments/models.py:294
+#: contrib/comments/models.py:271
#, python-format
msgid "Flag by %r"
msgstr "Flaggad av %r"
-#: contrib/comments/models.py:300
+#: contrib/comments/models.py:277
msgid "deletion date"
msgstr "borttagningsdatum"
-#: contrib/comments/models.py:303
+#: contrib/comments/models.py:280
msgid "moderator deletion"
msgstr "borttaget av moderator"
-#: contrib/comments/models.py:304
+#: contrib/comments/models.py:281
msgid "moderator deletions"
msgstr "borttagna av moderator"
-#: contrib/comments/models.py:308
+#: contrib/comments/models.py:285
#, python-format
msgid "Moderator deletion by %r"
msgstr "Borttaget av moderator %r"
@@ -1469,12 +1509,12 @@ msgstr "Förhandsgranska kommentar"
msgid "Your name:"
msgstr "Ditt namn:"
-#: contrib/comments/views/comments.py:28
+#: contrib/comments/views/comments.py:76
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr "Detta betyg krävs eftersom du har fyllt i minst ett annat betyg."
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:160
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
@@ -1497,7 +1537,7 @@ msgstr[1] ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:117
+#: contrib/comments/views/comments.py:165
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -1508,23 +1548,23 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:190
-#: contrib/comments/views/comments.py:283
+#: contrib/comments/views/comments.py:238
+#: contrib/comments/views/comments.py:331
msgid "Only POSTs are allowed"
msgstr "Endast POST är tillåtet"
-#: contrib/comments/views/comments.py:194
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:242
+#: contrib/comments/views/comments.py:335
msgid "One or more of the required fields wasn't submitted"
msgstr "Ett eller flera av de obligatoriska fälten skickades inte"
-#: contrib/comments/views/comments.py:198
-#: contrib/comments/views/comments.py:289
+#: contrib/comments/views/comments.py:246
+#: contrib/comments/views/comments.py:337
msgid "Somebody tampered with the comment form (security violation)"
msgstr "Någon har manipulerat kommentarformuläret (säkerhetsintrång)"
-#: contrib/comments/views/comments.py:208
-#: contrib/comments/views/comments.py:295
+#: contrib/comments/views/comments.py:256
+#: contrib/comments/views/comments.py:343
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
@@ -1532,8 +1572,8 @@ msgstr ""
"Kommentarformuläret hade en ogiltig 'target'-parameter -- objektets ID var "
"ogiltigt"
-#: contrib/comments/views/comments.py:259
-#: contrib/comments/views/comments.py:324
+#: contrib/comments/views/comments.py:307
+#: contrib/comments/views/comments.py:372
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
"Kommentarformuläret tillhandahöll varken 'förhandsgranska' eller 'post'"
@@ -1562,6 +1602,10 @@ msgstr "innehålls typ"
msgid "content types"
msgstr "innehålls typer"
+#: contrib/flatpages/admin.py:9
+msgid "Advanced options"
+msgstr "Avancerade inställningar"
+
#: contrib/flatpages/models.py:9
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -1608,32 +1652,27 @@ msgstr "statisk sida"
msgid "flat pages"
msgstr "statiska sidor"
-#: contrib/flatpages/models.py:27
-msgid "Advanced options"
-msgstr "Avancerade inställningar"
-
# Setting these as fuzzy because they might not make sense in Swedish. Consider
# the code's usage of them. They turn numbers such as 1 in to 1st, which isn't
# how we do it in Swedish, we do it by textualizing the number: first, första.
# For the time being, we'll leave these as fuzzy, IMO. // toxik
-
#: contrib/humanize/templatetags/humanize.py:19
-#,fuzzy
+#, fuzzy
msgid "th"
msgstr ":a"
#: contrib/humanize/templatetags/humanize.py:19
-#,fuzzy
+#, fuzzy
msgid "st"
msgstr ":a"
#: contrib/humanize/templatetags/humanize.py:19
-#,fuzzy
+#, fuzzy
msgid "nd"
msgstr ":e"
#: contrib/humanize/templatetags/humanize.py:19
-#,fuzzy
+#, fuzzy
msgid "rd"
msgstr ":e"
@@ -1728,6 +1767,58 @@ msgstr "Fyll i ett giltigt CUIT med formatet XX-XXXXXXXX-X eller XXXXXXXXXXXX."
msgid "Invalid CUIT."
msgstr "Felaktigt CUIT."
+#: contrib/localflavor/at/at_states.py:5
+#, fuzzy
+msgid "Burgenland"
+msgstr "Friesland"
+
+#: contrib/localflavor/at/at_states.py:6
+#, fuzzy
+msgid "Carinthia"
+msgstr "Kantabrien"
+
+#: contrib/localflavor/at/at_states.py:7
+#, fuzzy
+msgid "Lower Austria"
+msgstr "Lower Silesia"
+
+#: contrib/localflavor/at/at_states.py:8
+msgid "Upper Austria"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:9
+#, fuzzy
+msgid "Salzburg"
+msgstr "Hamburg"
+
+#: contrib/localflavor/at/at_states.py:10
+#, fuzzy
+msgid "Styria"
+msgstr "Soria"
+
+#: contrib/localflavor/at/at_states.py:11
+#, fuzzy
+msgid "Tyrol"
+msgstr "Tokyo"
+
+#: contrib/localflavor/at/at_states.py:12
+msgid "Vorarlberg"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:13
+msgid "Vienna"
+msgstr ""
+
+#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16
+#: contrib/localflavor/no/forms.py:12
+msgid "Enter a zip code in the format XXXX."
+msgstr "Fyll i postnummer med formatet XXXX."
+
+#: contrib/localflavor/at/forms.py:48
+#, fuzzy
+msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
+msgstr "Fyll i ett giltigt amerikanskt personnummer i formatet XXX-XX-XXXX."
+
#: contrib/localflavor/au/forms.py:16
msgid "Enter a 4 digit post code."
msgstr "Fyll i ett fyrsiffrigt postnummer."
@@ -1878,10 +1969,6 @@ msgstr "Zug"
msgid "Zurich"
msgstr "Zürich"
-#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12
-msgid "Enter a zip code in the format XXXX."
-msgstr "Fyll i postnummer med formatet XXXX."
-
#: contrib/localflavor/ch/forms.py:64
msgid ""
"Enter a valid Swiss identity or passport card number in X1234567<0 or "
@@ -2804,6 +2891,31 @@ msgstr ""
msgid "West Pomerania"
msgstr ""
+#: contrib/localflavor/ro/forms.py:19
+#, fuzzy
+msgid "Enter a valid CIF."
+msgstr "Fyll i en giltig URL."
+
+#: contrib/localflavor/ro/forms.py:56
+#, fuzzy
+msgid "Enter a valid CNP."
+msgstr "Fyll i en giltig URL."
+
+#: contrib/localflavor/ro/forms.py:141
+#, fuzzy
+msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
+msgstr "Fyll i ett giltigt CUIT med formatet XX-XXXXXXXX-X eller XXXXXXXXXXXX."
+
+#: contrib/localflavor/ro/forms.py:171
+#, fuzzy
+msgid "Phone numbers must be in XXXX-XXXXXX format."
+msgstr "Telefonnummer måste vara i formatet XX-XXXX-XXXX."
+
+#: contrib/localflavor/ro/forms.py:194
+#, fuzzy
+msgid "Enter a valid postal code in the format XXXXXX"
+msgstr "Fyll i ett postnummer med formatet XXX XXX."
+
#: contrib/localflavor/sk/forms.py:30
msgid "Enter a postal code in the format XXXXX or XXX XX."
msgstr "Fyll i ett postnummer med formatet XXXXX eller XXX XX."
@@ -3524,23 +3636,23 @@ msgstr "omdirigera"
msgid "redirects"
msgstr "omdirigeringar"
-#: contrib/sessions/models.py:41
+#: contrib/sessions/models.py:45
msgid "session key"
msgstr "sessionsnyckel"
-#: contrib/sessions/models.py:42
+#: contrib/sessions/models.py:47
msgid "session data"
msgstr "sessionsdata"
-#: contrib/sessions/models.py:43
+#: contrib/sessions/models.py:48
msgid "expire date"
msgstr "utgångsdatum"
-#: contrib/sessions/models.py:48
+#: contrib/sessions/models.py:53
msgid "session"
msgstr "session"
-#: contrib/sessions/models.py:49
+#: contrib/sessions/models.py:54
msgid "sessions"
msgstr "sessioner"
@@ -3552,18 +3664,14 @@ msgstr "domännamn"
msgid "display name"
msgstr "visningsnamn"
-#: contrib/sites/models.py:37
+#: contrib/sites/models.py:38
msgid "site"
msgstr "webbplats"
-#: contrib/sites/models.py:38
+#: contrib/sites/models.py:39
msgid "sites"
msgstr "webbplatser"
-#: core/validators.py:72
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Detta värde får endast innehålla bokstäver, siffror och understreck."
-
#: core/validators.py:76
msgid ""
"This value must contain only letters, numbers, underscores, dashes or "
@@ -3610,7 +3718,7 @@ msgstr "Icke-numeriska tecken är inte tillåtna här."
msgid "This value can't be comprised solely of digits."
msgstr "Detta värde kan inte enbart bestå av siffror."
-#: core/validators.py:128 newforms/fields.py:152
+#: core/validators.py:128 forms/fields.py:158
msgid "Enter a whole number."
msgstr "Fyll i ett heltal."
@@ -3619,36 +3727,31 @@ msgid "Only alphabetical characters are allowed here."
msgstr "Endast bokstäver är tillåtna här."
#: core/validators.py:147
-msgid "Year must be 1900 or later."
-msgstr "Årtal måste vara 1900 eller senare."
-
-#: core/validators.py:151
#, python-format
msgid "Invalid date: %s"
msgstr "Ogiltigt datum: %s"
-#: core/validators.py:156 db/models/fields/__init__.py:548
+#: core/validators.py:152 db/models/fields/__init__.py:559
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Fyll i ett giltigt datum med formatet ÅÅÅÅ-MM-DD."
-#: core/validators.py:161
+#: core/validators.py:157
msgid "Enter a valid time in HH:MM format."
msgstr "Fyll i ett giltigt klockslag med formatet TT:MM."
-#: core/validators.py:165 db/models/fields/__init__.py:625
+#: core/validators.py:161 db/models/fields/__init__.py:640
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Fyll i en giltig tidpunkt med formatet ÅÅÅÅ-MM-DD TT:MM."
-#: core/validators.py:170 newforms/fields.py:403
+#: core/validators.py:166 forms/fields.py:409
msgid "Enter a valid e-mail address."
msgstr "Fyll i en giltig e-postadress."
-#: core/validators.py:182 core/validators.py:474 newforms/fields.py:433
-#: oldforms/__init__.py:687
+#: core/validators.py:178 core/validators.py:470 forms/fields.py:427
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ingen fil skickades. Kontrollera kodningnstypen i formuläret."
-#: core/validators.py:193 newforms/fields.py:459
+#: core/validators.py:189 forms/fields.py:467
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -3656,28 +3759,28 @@ msgstr ""
"Ladda upp en giltig bild. Filen du laddade upp var antingen ingen bild eller "
"en korrupt bild."
-#: core/validators.py:200
+#: core/validators.py:196
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "URL:en %s pekar inte på en giltig bild."
-#: core/validators.py:204
+#: core/validators.py:200
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
msgstr ""
"Telefonnummer måste vara angivna med formatet XXX-XXX-XXXX. \"%s\" är "
"ogiltigt."
-#: core/validators.py:212
+#: core/validators.py:208
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "URL:en %s pekar inte på en giltig QuickTime-video."
-#: core/validators.py:216
+#: core/validators.py:212
msgid "A valid URL is required."
msgstr "En giltig URL krävs."
-#: core/validators.py:230
+#: core/validators.py:226
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
@@ -3686,84 +3789,84 @@ msgstr ""
"Giltig HTML krävs. Specifika fel är:\n"
"%s"
-#: core/validators.py:237
+#: core/validators.py:233
#, python-format
msgid "Badly formed XML: %s"
msgstr "Felaktigt formaterad XML: %s"
-#: core/validators.py:254
+#: core/validators.py:250
#, python-format
msgid "Invalid URL: %s"
msgstr "Felaktig URL: %s"
-#: core/validators.py:259 core/validators.py:261
+#: core/validators.py:255 core/validators.py:257
#, python-format
msgid "The URL %s is a broken link."
msgstr "URL:en %s är en trasig länk."
-#: core/validators.py:267
+#: core/validators.py:263
msgid "Enter a valid U.S. state abbreviation."
msgstr "Fyll i en giltig förkortning för en amerikansk delstat."
-#: core/validators.py:281
+#: core/validators.py:277
#, 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] "Akta din tunga! Ordet %s är inte tillåtet här."
msgstr[1] "Akta din tunga! Orden %s är inte tillåtna här."
-#: core/validators.py:288
+#: core/validators.py:284
#, python-format
msgid "This field must match the '%s' field."
msgstr "Detta fält måste matcha fältet '%s'."
-#: core/validators.py:307
+#: core/validators.py:303
msgid "Please enter something for at least one field."
msgstr "Var god fyll i minst ett fält."
-#: core/validators.py:316 core/validators.py:327
+#: core/validators.py:312 core/validators.py:323
msgid "Please enter both fields or leave them both empty."
msgstr "Fyll antingen i båda fälten eller lämna båda tomma."
-#: core/validators.py:335
+#: core/validators.py:331
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "Detta fält måste anges om %(field)s är %(value)s"
-#: core/validators.py:348
+#: core/validators.py:344
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr "Detta fält måste anges om %(field)s inte är %(value)s"
-#: core/validators.py:367
+#: core/validators.py:363
msgid "Duplicate values are not allowed."
msgstr "Dubbletter är inte tillåtna."
-#: core/validators.py:382
+#: core/validators.py:378
#, python-format
msgid "This value must be between %(lower)s and %(upper)s."
msgstr "Detta värde måste vara mellan %(lower)s och %(upper)s."
-#: core/validators.py:384
+#: core/validators.py:380
#, python-format
msgid "This value must be at least %s."
msgstr "Detta värde måste vara minst %s."
-#: core/validators.py:386
+#: core/validators.py:382
#, python-format
msgid "This value must be no more than %s."
msgstr "Detta värde får inte vara mer än %s."
-#: core/validators.py:427
+#: core/validators.py:423
#, python-format
msgid "This value must be a power of %s."
msgstr "Detta värde måste vara en potens av %s."
-#: core/validators.py:437
+#: core/validators.py:433
msgid "Please enter a valid decimal number."
msgstr "Fyll i ett giltigt decimaltal."
-#: core/validators.py:444
+#: core/validators.py:440
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
msgid_plural ""
@@ -3771,7 +3874,7 @@ msgid_plural ""
msgstr[0] "Fyll i ett giltigt decimaltal med som mest %s siffra totalt."
msgstr[1] "Fyll i ett giltigt decimaltal med som mest %s siffror totalt."
-#: core/validators.py:447
+#: core/validators.py:443
#, python-format
msgid ""
"Please enter a valid decimal number with a whole part of at most %s digit."
@@ -3782,7 +3885,7 @@ msgstr[0] ""
msgstr[1] ""
"Fyll i ett giltigt decimaltal med en heltalsdel med som mest %s siffror."
-#: core/validators.py:450
+#: core/validators.py:446
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural ""
@@ -3790,34 +3893,34 @@ msgid_plural ""
msgstr[0] "Fyll i ett giltigt decimaltal med som mest %s decimal."
msgstr[1] "Fyll i ett giltigt decimaltal med som mest %s decimaler."
-#: core/validators.py:458
+#: core/validators.py:454
msgid "Please enter a valid floating point number."
msgstr "Fyll i ett giltigt flyttal."
-#: core/validators.py:467
+#: core/validators.py:463
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "Se till att filen du laddade upp är minst %s byte stor."
-#: core/validators.py:468
+#: core/validators.py:464
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "Se till att filen du laddade upp är som mest %s byte stor."
-#: core/validators.py:485
+#: core/validators.py:481
msgid "The format for this field is wrong."
msgstr "Formatet för detta fält är fel."
-#: core/validators.py:500
+#: core/validators.py:496
msgid "This field is invalid."
msgstr "Detta fält är ogiltigt."
-#: core/validators.py:536
+#: core/validators.py:532
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "Kunde inte hämta något från %s."
-#: core/validators.py:539
+#: core/validators.py:535
#, python-format
msgid ""
"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@@ -3825,7 +3928,7 @@ msgstr ""
"URL:en %(url)s returnerade den ogiltiga Content-Type headern '%(contenttype)"
"s'."
-#: core/validators.py:572
+#: core/validators.py:568
#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -3834,7 +3937,7 @@ msgstr ""
"Var god avsluta den oavslutade taggen %(tag)s på rad %(line)s. (Raden börjar "
"med \"%(start)s\".)"
-#: core/validators.py:576
+#: core/validators.py:572
#, python-format
msgid ""
"Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -3843,7 +3946,7 @@ msgstr ""
"En del text som börjar på rad %(line)s är inte tillåten i det sammanhanget. "
"(Raden börjar med \"%(start)s\".)"
-#: core/validators.py:581
+#: core/validators.py:577
#, python-format
msgid ""
"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -3852,7 +3955,7 @@ msgstr ""
"\"%(attr)s\" på rad %(line)s är ett ogiltigt attribut. (Raden börjar med \"%"
"(start)s\".)"
-#: core/validators.py:586
+#: core/validators.py:582
#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -3861,7 +3964,7 @@ msgstr ""
"\"<%(tag)s>\" på rad %(line)s är en ogiltig tagg. (Raden börjar med \"%"
"(start)s\".)"
-#: core/validators.py:590
+#: core/validators.py:586
#, python-format
msgid ""
"A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -3870,7 +3973,7 @@ msgstr ""
"En tagg på rad %(line)s saknar en eller flera obligatoriska attribut. (Raden "
"börjar med \"%(start)s\".)"
-#: core/validators.py:595
+#: core/validators.py:591
#, python-format
msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -3879,62 +3982,58 @@ msgstr ""
"Attributet \"%(attr)s\" på rad %(line)s har ett ogiltigt värde. (Raden "
"börjar med \"%(start)s\".)"
-#: db/models/manipulators.py:308
+#: db/models/manipulators.py:304
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "%(object)s med typen %(type)s finns redan för %(field)s."
-#: db/models/fields/__init__.py:54
+#: db/models/fields/__init__.py:47
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "%(optname)s med detta %(fieldname)s finns redan."
-#: db/models/fields/__init__.py:179 db/models/fields/__init__.py:348
-#: db/models/fields/__init__.py:780 db/models/fields/__init__.py:791
-#: newforms/fields.py:46 oldforms/__init__.py:374
+#: db/models/fields/__init__.py:175 db/models/fields/__init__.py:343
+#: db/models/fields/__init__.py:802 db/models/fields/__init__.py:813
+#: forms/fields.py:52 oldforms/__init__.py:374
msgid "This field is required."
msgstr "Detta fält måste fyllas i."
-#: db/models/fields/__init__.py:448
+#: db/models/fields/__init__.py:457
msgid "This value must be an integer."
msgstr "Detta värde måste vara ett heltal."
-#: db/models/fields/__init__.py:487
+#: db/models/fields/__init__.py:498
msgid "This value must be either True or False."
msgstr "Detta värde måste vara antingen True eller False."
-#: db/models/fields/__init__.py:511
+#: db/models/fields/__init__.py:522
msgid "This field cannot be null."
msgstr "Detta fält får inte vara null."
-#: db/models/fields/__init__.py:689
+#: db/models/fields/__init__.py:709
msgid "This value must be a decimal number."
msgstr "Detta värde måste vara ett decimaltal."
-#: db/models/fields/__init__.py:800
+#: db/models/fields/__init__.py:822
msgid "Enter a valid filename."
msgstr "Fyll i ett giltigt filnamn."
-#: db/models/fields/__init__.py:981
+#: db/models/fields/__init__.py:1013
msgid "This value must be either None, True or False."
msgstr "Detta värde måste vara antingen None, True eller False."
-#: db/models/fields/related.py:94
+#: db/models/fields/related.py:93
#, python-format
msgid "Please enter a valid %s."
msgstr "Var god fyll i giltig %s."
-#: db/models/fields/related.py:721
-msgid "Separate multiple IDs with commas."
-msgstr "Separera flera ID-nummer med kommatecken."
-
-#: db/models/fields/related.py:723
+#: db/models/fields/related.py:729
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Håll ner \"Control\" eller \"Command\" på en Mac för att välja fler än en."
-#: db/models/fields/related.py:770
+#: db/models/fields/related.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -3944,101 +4043,101 @@ msgstr[0] ""
msgstr[1] ""
"Var god och fyll giltiga %(self)s ID-nummer. Värdena %(value)r är ogiltiga."
-#: newforms/fields.py:47
+#: forms/fields.py:53
msgid "Enter a valid value."
msgstr "Fyll i ett giltigt värde."
-#: newforms/fields.py:124
+#: forms/fields.py:130
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Kontrollera att detta värde har högst %(max)d tecken (det har %(length)d)."
-#: newforms/fields.py:125
+#: forms/fields.py:131
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Kontrollera att detta värde har minst %(min)d tecken (det har %(length)d)."
-#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211
+#: forms/fields.py:159 forms/fields.py:188 forms/fields.py:217
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Kontrollera att detta värde är mindre eller lika med %s."
-#: newforms/fields.py:154 newforms/fields.py:183 newforms/fields.py:212
+#: forms/fields.py:160 forms/fields.py:189 forms/fields.py:218
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Kontrollera att detta värde är mer eller lika med %s."
-#: newforms/fields.py:181 newforms/fields.py:210
+#: forms/fields.py:187 forms/fields.py:216
msgid "Enter a number."
msgstr "Fyll i ett tal."
-#: newforms/fields.py:213
+#: forms/fields.py:219
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Kontrollera att det inte finns mer än totalt %s siffror."
-#: newforms/fields.py:214
+#: forms/fields.py:220
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Kontrollera att det inte finns mer än %s decimaler."
-#: newforms/fields.py:215
+#: forms/fields.py:221
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Kontrollera att det inte finns mer än %s siffror före decimaltecknet."
-#: newforms/fields.py:263 newforms/fields.py:751
+#: forms/fields.py:269 forms/fields.py:799
msgid "Enter a valid date."
msgstr "Fyll i ett giltigt datum."
-#: newforms/fields.py:296 newforms/fields.py:752
+#: forms/fields.py:302 forms/fields.py:800
msgid "Enter a valid time."
msgstr "Fyll i en giltig tid."
-#: newforms/fields.py:335
+#: forms/fields.py:341
msgid "Enter a valid date/time."
msgstr "Fyll i ett giltigt datum/tid."
-#: newforms/fields.py:434
+#: forms/fields.py:428
msgid "No file was submitted."
msgstr "Ingen fil skickades."
-#: newforms/fields.py:435 oldforms/__init__.py:689
+#: forms/fields.py:429 oldforms/__init__.py:693
msgid "The submitted file is empty."
msgstr "Den skickade filen är tom."
-#: newforms/fields.py:497
+#: forms/fields.py:528
msgid "Enter a valid URL."
msgstr "Fyll i en giltig URL."
-#: newforms/fields.py:498
+#: forms/fields.py:529
msgid "This URL appears to be a broken link."
msgstr "Denna URL verkar vara en trasig länk."
-#: newforms/fields.py:560 newforms/models.py:299
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-"Välj ett giltigt alternativ. Det valet finns inte bland tillgängliga "
-"alternativ."
-
-#: newforms/fields.py:599
+#: forms/fields.py:597 forms/fields.py:648
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Välj ett giltigt alternativ. %(value)s finns inte bland tillgängliga "
"alternativ."
-#: newforms/fields.py:600 newforms/fields.py:662 newforms/models.py:371
+#: forms/fields.py:649 forms/fields.py:710 forms/models.py:581
msgid "Enter a list of values."
msgstr "Fyll i en lista med värden."
-#: newforms/fields.py:780
+#: forms/fields.py:828
msgid "Enter a valid IPv4 address."
msgstr "Fyll i en giltig IPv4 adress."
-#: newforms/models.py:372
+#: forms/models.py:514
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Välj ett giltigt alternativ. Det valet finns inte bland tillgängliga "
+"alternativ."
+
+#: forms/models.py:582
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
@@ -4060,15 +4159,15 @@ msgstr "Radbrytningar är inte tillåtna här."
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Välj ett giltigt alternativ; '%(data)s' finns inte bland %(choices)s."
-#: oldforms/__init__.py:745
+#: oldforms/__init__.py:754
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Fyll i ett heltal mellan -32768 och 32767."
-#: oldforms/__init__.py:755
+#: oldforms/__init__.py:764
msgid "Enter a positive number."
msgstr "Fyll i ett positivt tal."
-#: oldforms/__init__.py:765
+#: oldforms/__init__.py:774
msgid "Enter a whole number between 0 and 32,767."
msgstr "Fyll i ett heltal mellan 0 och 32767."
@@ -4302,7 +4401,7 @@ msgstr "Nov."
msgid "Dec."
msgstr "Dec."
-#: utils/text.py:127
+#: utils/text.py:128
msgid "or"
msgstr "eller"
@@ -4356,41 +4455,62 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:403
+#: utils/translation/trans_real.py:401
msgid "DATE_FORMAT"
msgstr "Y-m-d"
-#: utils/translation/trans_real.py:404
+#: utils/translation/trans_real.py:402
msgid "DATETIME_FORMAT"
msgstr "Y-m-d H:i"
-#: utils/translation/trans_real.py:405
+#: utils/translation/trans_real.py:403
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:421
+#: utils/translation/trans_real.py:419
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:422
+#: utils/translation/trans_real.py:420
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
-#: views/generic/create_update.py:43
+#: views/generic/create_update.py:129
#, python-format
msgid "The %(verbose_name)s was created successfully."
msgstr "%(verbose_name)s skapades."
-#: views/generic/create_update.py:117
+#: views/generic/create_update.py:172
#, python-format
msgid "The %(verbose_name)s was updated successfully."
msgstr "%(verbose_name)s uppdaterades."
-#: views/generic/create_update.py:184
+#: views/generic/create_update.py:214
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s togs bort."
+#~ msgid "Ordering"
+#~ msgstr "Sortering"
+
+#~ msgid "Order:"
+#~ msgstr "Sortera:"
+
+#~ msgid "Added %s."
+#~ msgstr "Lade till %s."
+
+#~ msgid "Deleted %s."
+#~ msgstr "Tog bort %s."
+
+#~ msgid "The two 'new password' fields didn't match."
+#~ msgstr "De två 'nytt lösenord'-fälten stämde inte överens."
+
+#~ msgid "Year must be 1900 or later."
+#~ msgstr "Årtal måste vara 1900 eller senare."
+
+#~ msgid "Separate multiple IDs with commas."
+#~ msgstr "Separera flera ID-nummer med kommatecken."
+
#~ msgid "Brazilian"
#~ msgstr "Brasilianska"
diff --git a/django/conf/project_template/urls.py b/django/conf/project_template/urls.py
index 98335a151c..7b56d73c9e 100644
--- a/django/conf/project_template/urls.py
+++ b/django/conf/project_template/urls.py
@@ -1,15 +1,16 @@
from django.conf.urls.defaults import *
-# Uncomment this for admin:
-#from django.contrib import admin
+# Uncomment the next two lines to enable the admin:
+# from django.contrib import admin
+# admin.autodiscover()
urlpatterns = patterns('',
# Example:
# (r'^{{ project_name }}/', include('{{ project_name }}.foo.urls')),
- # Uncomment this for admin docs:
- #(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+ # Uncomment the next line to enable admin documentation:
+ # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
- # Uncomment this for admin:
- #('^admin/(.*)', admin.site.root),
+ # Uncomment the next line for to enable the admin:
+ # (r'^admin/(.*)', admin.site.root),
)
diff --git a/django/contrib/admin/__init__.py b/django/contrib/admin/__init__.py
index 56b64faacb..704dc58ee4 100644
--- a/django/contrib/admin/__init__.py
+++ b/django/contrib/admin/__init__.py
@@ -8,9 +8,12 @@ def autodiscover():
not present. This forces an import on them to register any admin bits they
may want.
"""
+ import imp
from django.conf import settings
for app in settings.INSTALLED_APPS:
try:
- __import__("%s.admin" % app)
+ imp.find_module("admin", __import__(app, {}, {}, [app.split(".")[-1]]).__path__)
except ImportError:
- pass
+ # there is no app admin.py, skip it
+ continue
+ __import__("%s.admin" % app)
diff --git a/django/contrib/admin/media/css/rtl.css b/django/contrib/admin/media/css/rtl.css
index 1974e7c2ec..54175a7f9a 100644
--- a/django/contrib/admin/media/css/rtl.css
+++ b/django/contrib/admin/media/css/rtl.css
@@ -44,3 +44,6 @@ div.breadcrumbs { text-align:right; }
.selector { float: right;}
.selector .selector-filter { text-align: right;}
+
+/* x unsorted */
+.inline-related h2 { text-align:right }
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 501014a0d5..d161c58e64 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -1,5 +1,4 @@
-from django import oldforms, template
-from django import forms
+from django import forms, template
from django.forms.formsets import all_valid
from django.forms.models import modelform_factory, inlineformset_factory
from django.forms.models import BaseInlineFormset
@@ -15,7 +14,10 @@ from django.utils.safestring import mark_safe
from django.utils.text import capfirst, get_text_list
from django.utils.translation import ugettext as _
from django.utils.encoding import force_unicode
-import sets
+try:
+ set
+except NameError:
+ from sets import Set as set # Python 2.3 fallback
HORIZONTAL, VERTICAL = 1, 2
# returns the
class for a given radio_admin field
@@ -90,7 +92,7 @@ class Fieldline(object):
yield AdminField(self.form, field, is_first=(i == 0))
def errors(self):
- return mark_safe(u'\n'.join([self.form[f].errors.as_ul() for f in self.fields]))
+ return mark_safe(u'\n'.join([self.form[f].errors.as_ul() for f in self.fields]).strip('\n'))
class AdminField(object):
def __init__(self, form, field, is_first):
@@ -130,6 +132,23 @@ class BaseModelAdmin(object):
If kwargs are given, they're passed to the form Field's constructor.
"""
+
+ # If the field specifies choices, we don't need to look for special
+ # admin widgets - we just need to use a select widget of some kind.
+ if db_field.choices:
+ if db_field.name in self.radio_fields:
+ # If the field is named as a radio_field, use a RadioSelect
+ kwargs['widget'] = widgets.AdminRadioSelect(
+ choices=db_field.get_choices(include_blank=db_field.blank,
+ blank_choice=[('', _('None'))]),
+ attrs={
+ 'class': get_ul_class(self.radio_fields[db_field.name]),
+ }
+ )
+ else:
+ # Otherwise, use the default select widget.
+ return db_field.formfield(**kwargs)
+
# For DateTimeFields, use a special field and widget.
if isinstance(db_field, models.DateTimeField):
kwargs['form_class'] = forms.SplitDateTimeField
@@ -162,10 +181,13 @@ class BaseModelAdmin(object):
kwargs['empty_label'] = db_field.blank and _('None') or None
else:
if isinstance(db_field, models.ManyToManyField):
- if db_field.name in self.raw_id_fields:
+ # If it uses an intermediary model, don't show field in admin.
+ if db_field.rel.through is not None:
+ return None
+ elif db_field.name in self.raw_id_fields:
kwargs['widget'] = widgets.ManyToManyRawIdWidget(db_field.rel)
kwargs['help_text'] = ''
- elif db_field.name in (self.filter_vertical + self.filter_horizontal):
+ elif db_field.name in (list(self.filter_vertical) + list(self.filter_horizontal)):
kwargs['widget'] = widgets.FilteredSelectMultiple(db_field.verbose_name, (db_field.name in self.filter_vertical))
# Wrap the widget's render() method with a method that adds
# extra HTML to the end of the rendered output.
@@ -174,15 +196,6 @@ class BaseModelAdmin(object):
if not db_field.name in self.raw_id_fields:
formfield.widget = widgets.RelatedFieldWidgetWrapper(formfield.widget, db_field.rel, self.admin_site)
return formfield
-
- if db_field.choices and db_field.name in self.radio_fields:
- kwargs['widget'] = widgets.AdminRadioSelect(
- choices=db_field.get_choices(include_blank=db_field.blank,
- blank_choice=[('', _('None'))]),
- attrs={
- 'class': get_ul_class(self.radio_fields[db_field.name]),
- }
- )
# For any other type of field, just call its formfield() method.
return db_field.formfield(**kwargs)
@@ -210,7 +223,7 @@ class ModelAdmin(BaseModelAdmin):
save_on_top = False
ordering = None
inlines = []
-
+
# Custom templates (designed to be over-ridden in subclasses)
change_form_template = None
change_list_template = None
@@ -261,7 +274,7 @@ class ModelAdmin(BaseModelAdmin):
js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js'])
if self.filter_vertical or self.filter_horizontal:
js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js'])
-
+
return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js])
media = property(_media)
@@ -345,7 +358,7 @@ class ModelAdmin(BaseModelAdmin):
pk_value = new_object._get_pk_val()
LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(self.model).id, pk_value, force_unicode(new_object), ADDITION)
- msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': opts.verbose_name, 'obj': new_object}
+ msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': new_object}
# Here, we distinguish between different save types by checking for
# the presence of keys in request.POST.
if request.POST.has_key("_continue"):
@@ -359,7 +372,7 @@ class ModelAdmin(BaseModelAdmin):
# escape() calls force_unicode.
(escape(pk_value), escape(new_object)))
elif request.POST.has_key("_addanother"):
- request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name))
+ request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % force_unicode(opts.verbose_name)))
return HttpResponseRedirect(request.path)
else:
request.user.message_set.create(message=msg)
@@ -378,7 +391,7 @@ class ModelAdmin(BaseModelAdmin):
Saves the object in the "change" stage and returns an HttpResponseRedirect.
`form` is a bound Form instance that's verified to be valid.
-
+
`formsets` is a sequence of InlineFormSet instances that are verified to be valid.
"""
from django.contrib.admin.models import LogEntry, CHANGE
@@ -394,20 +407,20 @@ class ModelAdmin(BaseModelAdmin):
change_message = []
if form.changed_data:
change_message.append(_('Changed %s.') % get_text_list(form.changed_data, _('and')))
-
+
if formsets:
for formset in formsets:
for added_object in formset.new_objects:
- change_message.append(_('Added %(name)s "%(object)s".')
+ change_message.append(_('Added %(name)s "%(object)s".')
% {'name': added_object._meta.verbose_name,
'object': added_object})
for changed_object, changed_fields in formset.changed_objects:
- change_message.append(_('Changed %(list)s for %(name)s "%(object)s".')
- % {'list': get_text_list(changed_fields, _('and')),
- 'name': changed_object._meta.verbose_name,
+ change_message.append(_('Changed %(list)s for %(name)s "%(object)s".')
+ % {'list': get_text_list(changed_fields, _('and')),
+ 'name': changed_object._meta.verbose_name,
'object': changed_object})
for deleted_object in formset.deleted_objects:
- change_message.append(_('Deleted %(name)s "%(object)s".')
+ change_message.append(_('Deleted %(name)s "%(object)s".')
% {'name': deleted_object._meta.verbose_name,
'object': deleted_object})
change_message = ' '.join(change_message)
@@ -415,7 +428,7 @@ class ModelAdmin(BaseModelAdmin):
change_message = _('No fields changed.')
LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(self.model).id, pk_value, force_unicode(new_object), CHANGE, change_message)
- msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': opts.verbose_name, 'obj': new_object}
+ msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': new_object}
if request.POST.has_key("_continue"):
request.user.message_set.create(message=msg + ' ' + _("You may edit it again below."))
if request.REQUEST.has_key('_popup'):
@@ -423,10 +436,10 @@ class ModelAdmin(BaseModelAdmin):
else:
return HttpResponseRedirect(request.path)
elif request.POST.has_key("_saveasnew"):
- request.user.message_set.create(message=_('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': opts.verbose_name, 'obj': new_object})
+ request.user.message_set.create(message=_('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': force_unicode(opts.verbose_name), 'obj': new_object})
return HttpResponseRedirect("../%s/" % pk_value)
elif request.POST.has_key("_addanother"):
- request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name))
+ request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % force_unicode(opts.verbose_name)))
return HttpResponseRedirect("../add/")
else:
request.user.message_set.create(message=msg)
@@ -504,7 +517,7 @@ class ModelAdmin(BaseModelAdmin):
inline_admin_formsets.append(inline_admin_formset)
context = {
- 'title': _('Add %s') % opts.verbose_name,
+ 'title': _('Add %s') % force_unicode(opts.verbose_name),
'adminform': adminForm,
'is_popup': request.REQUEST.has_key('_popup'),
'show_delete': False,
@@ -534,7 +547,7 @@ class ModelAdmin(BaseModelAdmin):
raise PermissionDenied
if obj is None:
- raise Http404('%s object with primary key %r does not exist.' % (opts.verbose_name, escape(object_id)))
+ raise Http404('%s object with primary key %r does not exist.' % (force_unicode(opts.verbose_name), escape(object_id)))
if request.POST and request.POST.has_key("_saveasnew"):
return self.add_view(request, form_url='../../add/')
@@ -557,17 +570,16 @@ class ModelAdmin(BaseModelAdmin):
adminForm = AdminForm(form, self.get_fieldsets(request, obj), self.prepopulated_fields)
media = self.media + adminForm.media
- for fs in inline_formsets:
- media = media + fs.media
inline_admin_formsets = []
for inline, formset in zip(self.inline_instances, inline_formsets):
fieldsets = list(inline.get_fieldsets(request, obj))
inline_admin_formset = InlineAdminFormSet(inline, formset, fieldsets)
inline_admin_formsets.append(inline_admin_formset)
+ media = media + inline_admin_formset.media
context = {
- 'title': _('Change %s') % opts.verbose_name,
+ 'title': _('Change %s') % force_unicode(opts.verbose_name),
'adminform': adminForm,
'object_id': object_id,
'original': obj,
@@ -599,7 +611,7 @@ class ModelAdmin(BaseModelAdmin):
if ERROR_FLAG in request.GET.keys():
return render_to_response('admin/invalid_setup.html', {'title': _('Database error')})
return HttpResponseRedirect(request.path + '?' + ERROR_FLAG + '=1')
-
+
context = {
'title': cl.title,
'is_popup': cl.is_popup,
@@ -632,12 +644,12 @@ class ModelAdmin(BaseModelAdmin):
raise PermissionDenied
if obj is None:
- raise Http404('%s object with primary key %r does not exist.' % (opts.verbose_name, escape(object_id)))
+ raise Http404('%s object with primary key %r does not exist.' % (force_unicode(opts.verbose_name), escape(object_id)))
# Populate deleted_objects, a data structure of all related objects that
# will also be deleted.
deleted_objects = [mark_safe(u'%s: %s' % (escape(force_unicode(capfirst(opts.verbose_name))), quote(object_id), escape(obj))), []]
- perms_needed = sets.Set()
+ perms_needed = set()
get_deleted_objects(deleted_objects, perms_needed, request.user, obj, opts, 1, self.admin_site)
if request.POST: # The user has already confirmed the deletion.
@@ -650,10 +662,10 @@ class ModelAdmin(BaseModelAdmin):
if not self.has_change_permission(request, None):
return HttpResponseRedirect("../../../../")
return HttpResponseRedirect("../../")
-
+
context = {
"title": _("Are you sure?"),
- "object_name": opts.verbose_name,
+ "object_name": force_unicode(opts.verbose_name),
"object": obj,
"deleted_objects": deleted_objects,
"perms_lacking": perms_needed,
@@ -681,7 +693,7 @@ class ModelAdmin(BaseModelAdmin):
context = {
'title': _('Change history: %s') % force_unicode(obj),
'action_list': action_list,
- 'module_name': capfirst(opts.verbose_name_plural),
+ 'module_name': capfirst(force_unicode(opts.verbose_name_plural)),
'object': obj,
'root_path': self.admin_site.root_path,
}
@@ -761,6 +773,13 @@ class InlineAdminFormSet(object):
for field_name in flatten_fieldsets(self.fieldsets):
yield self.formset.form.base_fields[field_name]
+ def _media(self):
+ media = self.formset.media
+ for fs in self:
+ media = media + fs.media
+ return media
+ media = property(_media)
+
class InlineAdminForm(AdminForm):
"""
A wrapper around an inline form for use in the admin system.
diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py
index bb4dc58ece..26e935e7fb 100644
--- a/django/contrib/admin/sites.py
+++ b/django/contrib/admin/sites.py
@@ -1,3 +1,7 @@
+import base64
+import cPickle as pickle
+import re
+
from django import http, template
from django.contrib.admin import ModelAdmin
from django.contrib.auth import authenticate, login
@@ -8,11 +12,7 @@ from django.utils.text import capfirst
from django.utils.translation import ugettext_lazy, ugettext as _
from django.views.decorators.cache import never_cache
from django.conf import settings
-import base64
-import cPickle as pickle
-import datetime
-import md5
-import re
+from django.utils.hashcompat import md5_constructor
ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.")
LOGIN_FORM_KEY = 'this_is_the_login_form'
@@ -26,16 +26,14 @@ class NotRegistered(Exception):
pass
def _encode_post_data(post_data):
- from django.conf import settings
pickled = pickle.dumps(post_data)
- pickled_md5 = md5.new(pickled + settings.SECRET_KEY).hexdigest()
+ pickled_md5 = md5_constructor(pickled + settings.SECRET_KEY).hexdigest()
return base64.encodestring(pickled + pickled_md5)
def _decode_post_data(encoded_data):
- from django.conf import settings
encoded_data = base64.decodestring(encoded_data)
pickled, tamper_check = encoded_data[:-32], encoded_data[-32:]
- if md5.new(pickled + settings.SECRET_KEY).hexdigest() != tamper_check:
+ if md5_constructor(pickled + settings.SECRET_KEY).hexdigest() != tamper_check:
from django.core.exceptions import SuspiciousOperation
raise SuspiciousOperation, "User may have tampered with session cookie."
return pickle.loads(pickled)
@@ -47,10 +45,10 @@ class AdminSite(object):
register() method, and the root() method can then be used as a Django view function
that presents a full admin interface for the collection of registered models.
"""
-
+
index_template = None
login_template = None
-
+
def __init__(self):
self._registry = {} # model_class class -> admin_class instance
@@ -66,19 +64,33 @@ class AdminSite(object):
If a model is already registered, this will raise AlreadyRegistered.
"""
- do_validate = admin_class and settings.DEBUG
- if do_validate:
- # don't import the humongous validation code unless required
+ # Don't import the humongous validation code unless required
+ if admin_class and settings.DEBUG:
from django.contrib.admin.validation import validate
- admin_class = admin_class or ModelAdmin
- # TODO: Handle options
+ else:
+ validate = lambda model, adminclass: None
+
+ if not admin_class:
+ admin_class = ModelAdmin
if isinstance(model_or_iterable, ModelBase):
model_or_iterable = [model_or_iterable]
for model in model_or_iterable:
if model in self._registry:
raise AlreadyRegistered('The model %s is already registered' % model.__name__)
- if do_validate:
- validate(admin_class, model)
+
+ # If we got **options then dynamically construct a subclass of
+ # admin_class with those **options.
+ if options:
+ # For reasons I don't quite understand, without a __module__
+ # the created class appears to "live" in the wrong place,
+ # which causes issues later on.
+ options['__module__'] = __name__
+ admin_class = type("%sAdmin" % model.__name__, (admin_class,), options)
+
+ # Validate (which might be a no-op)
+ validate(admin_class, model)
+
+ # Instantiate the admin class to save in the registry
self._registry[model] = admin_class(model, self)
def unregister(self, model_or_iterable):
@@ -102,23 +114,23 @@ class AdminSite(object):
return request.user.is_authenticated() and request.user.is_staff
def root(self, request, url):
- """
+ """
Handles main URL routing for the admin app.
`url` is the remainder of the URL -- e.g. 'comments/comment/'.
"""
if request.method == 'GET' and not request.path.endswith('/'):
return http.HttpResponseRedirect(request.path + '/')
-
+
# Figure out the admin base URL path and stash it for later use
self.root_path = re.sub(re.escape(url) + '$', '', request.path)
-
+
url = url.rstrip('/') # Trim trailing slash, if it exists.
# The 'logout' view doesn't require that the person is logged in.
if url == 'logout':
return self.logout(request)
-
+
# Check permission to continue or display login form.
if not self.has_permission(request):
return self.login(request)
@@ -139,7 +151,7 @@ class AdminSite(object):
match = USER_CHANGE_PASSWORD_URL_RE.match(url)
if match:
return self.user_change_password(request, match.group(1))
-
+
if '/' in url:
return self.model_page(request, *url.split('/', 2))
@@ -189,7 +201,6 @@ class AdminSite(object):
This takes into account the USE_I18N setting. If it's set to False, the
generated JavaScript will be leaner and faster.
"""
- from django.conf import settings
if settings.USE_I18N:
from django.views.i18n import javascript_catalog
else:
@@ -249,9 +260,6 @@ class AdminSite(object):
else:
if user.is_active and user.is_staff:
login(request, user)
- # TODO: set last_login with an event.
- user.last_login = datetime.datetime.now()
- user.save()
if request.POST.has_key('post_data'):
post_data = _decode_post_data(request.POST['post_data'])
if post_data and not post_data.has_key(LOGIN_FORM_KEY):
@@ -308,14 +316,14 @@ class AdminSite(object):
# Sort the models alphabetically within each app.
for app in app_list:
app['models'].sort(lambda x, y: cmp(x['name'], y['name']))
-
+
context = {
'title': _('Site administration'),
'app_list': app_list,
'root_path': self.root_path,
}
context.update(extra_context or {})
- return render_to_response(self.index_template or 'admin/index.html', context,
+ return render_to_response(self.index_template or 'admin/index.html', context,
context_instance=template.RequestContext(request)
)
index = never_cache(index)
@@ -330,7 +338,7 @@ class AdminSite(object):
post_data = _encode_post_data(request.POST)
else:
post_data = _encode_post_data({})
-
+
context = {
'title': _('Log in'),
'app_path': request.path,
diff --git a/django/contrib/admin/templates/admin/includes/fieldset.html b/django/contrib/admin/templates/admin/includes/fieldset.html
index a61795cfe4..27e54c75d3 100644
--- a/django/contrib/admin/templates/admin/includes/fieldset.html
+++ b/django/contrib/admin/templates/admin/includes/fieldset.html
@@ -1,6 +1,6 @@
\ No newline at end of file
+
diff --git a/django/contrib/admin/templates/admin_doc/model_detail.html b/django/contrib/admin/templates/admin_doc/model_detail.html
index 81bf87db15..414397f23a 100644
--- a/django/contrib/admin/templates/admin_doc/model_detail.html
+++ b/django/contrib/admin/templates/admin_doc/model_detail.html
@@ -34,7 +34,7 @@
{{ field.name }}
{{ field.data_type }}
-
{% if field.verbose %}{{ field.verbose }}{% endif %}{% if field.help_text %} - {{ field.help_text }}{% endif %}
+
{% if field.verbose %}{{ field.verbose }}{% endif %}{% if field.help_text %} - {{ field.help_text|safe }}{% endif %}
{% endblock %}
+
+{% block title %}{% trans 'Password reset' %}{% endblock %}
+
+{% block content %}
+
+{% if validlink %}
+
+
{% trans 'Enter new password' %}
+
+
{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}
+
+
+
+{% else %}
+
+
{% trans 'Password reset unsuccessful' %}
+
+
{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}
+
+{% endif %}
+
+{% endblock %}
diff --git a/django/contrib/admin/templates/registration/password_reset_done.html b/django/contrib/admin/templates/registration/password_reset_done.html
index f97b5688c2..e223bdb9de 100644
--- a/django/contrib/admin/templates/registration/password_reset_done.html
+++ b/django/contrib/admin/templates/registration/password_reset_done.html
@@ -9,6 +9,6 @@
{% trans 'Password reset successful' %}
-
{% trans "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly." %}
+
{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}
{% endblock %}
diff --git a/django/contrib/admin/templates/registration/password_reset_email.html b/django/contrib/admin/templates/registration/password_reset_email.html
index f765dd0670..3b2d5b0f34 100644
--- a/django/contrib/admin/templates/registration/password_reset_email.html
+++ b/django/contrib/admin/templates/registration/password_reset_email.html
@@ -1,15 +1,15 @@
-{% load i18n %}
+{% load i18n %}{% autoescape off %}
{% trans "You're receiving this e-mail because you requested a password reset" %}
{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}.
-{% blocktrans %}Your new password is: {{ new_password }}{% endblocktrans %}
-
-{% trans "Feel free to change this password by going to this page:" %}
-
-http://{{ domain }}/password_change/
-
+{% trans "Please go to the following page and choose a new password:" %}
+{% block reset_link %}
+{{ protocol }}://{{ domain }}/reset/{{ uid }}-{{ token }}/
+{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
{% trans "Thanks for using our site!" %}
{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
+
+{% endautoescape %}
diff --git a/django/contrib/admin/templates/registration/password_reset_form.html b/django/contrib/admin/templates/registration/password_reset_form.html
index d8c7d03f93..4ecebc77a1 100644
--- a/django/contrib/admin/templates/registration/password_reset_form.html
+++ b/django/contrib/admin/templates/registration/password_reset_form.html
@@ -9,7 +9,7 @@
{% trans "Password reset" %}
-
{% trans "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you." %}
+
{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}