diff -Nru python-django-1.6.6/AUTHORS python-django-1.7.4/AUTHORS
--- python-django-1.6.6/AUTHORS 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/AUTHORS 2015-01-27 17:12:29.000000000 +0000
@@ -46,6 +46,7 @@
* Daniel Lindsley
* Marc Tamlyn
* Baptiste Mispelon
+ * Daniele Procida
More information on the main contributors to Django can be found in
docs/internals/committers.txt.
@@ -56,10 +57,11 @@
Gisle Aas
Chris Adams
- Christopher Adams
+ Christopher Adams
Mathieu Agopian
Roberto Aguilar
ajs
+ Akis Kesoglou
alang@bright-green.com
A S Alam
Andi Albrecht
@@ -88,12 +90,14 @@
David Avsajanishvili
Mike Axiak
Niran Babalola
+ Christopher Babiak
Vitaly Babiy
Morten Bagai
Jeff Balogh
Mikaël Barbero
Randy Barlow
Scott Barr
+ Raphaël Barrois
Jiri Barton
Jorge Bastida
Ned Batchelder
@@ -119,6 +123,8 @@
Craig Blaszczyk
David Blewett
Artem Gnilov
+ Eric Boersma
+ Joel Bohman
Matías Bordese
Nate Bragg
Sean Brant
@@ -131,6 +137,8 @@
btoll@bestweb.net
Jonathan Buchanan
Jacob Burch
+ Stephen Burrows
+ Max Burstein
Keith Bussell
C8E
Chris Cahoon
@@ -141,6 +149,8 @@
Ricardo Javier Cárdenes Medina
Jeremy Carbaugh
Graham Carlyle
+ Eric Palakovich Carr
+ Juan Catalano
Antonio Cavedoni
cedric@terramater.net
Chris Chamberlin
@@ -163,6 +173,7 @@
Paul Collier
Paul Collins
Robert Coup
+ Alex Couper
Deric Crago
Brian Fabian Crain
David Cramer
@@ -198,6 +209,7 @@
dready
Maximillian Dornseif
Daniel Duan
+ Aram Dulyan
Andrew Durdin
dusk@woofle.net
Andy Dustman
@@ -206,6 +218,7 @@
Clint Ecker
Nick Efford
Marc Egli
+ Matt Deacalion Stevens
eibaan@gmail.com
David Eklund
Julia Elman
@@ -258,6 +271,7 @@
David Gouldin
pradeep.gowda@gmail.com
Collin Grady
+ Luke Granger-Brown
Gabriel Grant
Martin Green
Daniel Greenfeld
@@ -273,9 +287,11 @@
Scot Hacker
dAniel hAhler
hambaloney
+ Nasimul Haque
Will Hardy
Brian Harring
Brant Harris
+ Pascal Hartig
Ronny Haryanto
Axel Haustant
Hawkeye
@@ -313,11 +329,14 @@
Dmitry Jemerov
jhenry
john@calixto.net
+ Dan Johnson
Zak Johnson
Nis Jørgensen
Michael Josephson
+ Anubhav Joshi
jpellerin@gmail.com
junzhang.jn@gmail.com
+ Krzysztof Jurewicz
Xia Kai
Antti Kaihola
Peter van Kampen
@@ -331,6 +350,7 @@
Niall Kelly
Ryan Kelly
Thomas Kerpe
+ Matthias Kestenholz
Wiley Kestner
Ossama M. Khayat
Ben Khoo
@@ -342,6 +362,7 @@
Cameron Knight (ckknight)
Nena Kojadin
Igor Kolar
+ Wiktor Kołodziej
Tomáš Kopeček
Gasper Koren
Mikhail Korobov
@@ -354,10 +375,12 @@
knox
David Krauth
Kevin Kubasik
+ Krzysztof Kulewski
kurtiss@meetro.com
Vladimir Kuzma
Denis Kuzmichyov
Panos Laganakos
+ Chris Lamb
Nick Lane
Łukasz Langa
Stuart Langridge
@@ -391,6 +414,7 @@
Yann Malet
Frantisek Malina
Mike Malone
+ Curtis Maloney (FunkyBob)
Martin Maney
Michael Manfre
Javier Mansilla
@@ -403,6 +427,7 @@
mark@junklight.com
Orestis Markou
Andrés Torres Marroquín
+ Pablo Martín
Takashi Matsuo
Zlatko Mašek
Yasushi Masuda
@@ -419,6 +444,8 @@
Zain Memon
Christian Metts
michal@plovarna.cz
+ Justin Michalicek
+ Bojan Mihelac
Slawek Mikula
Katie Miller
Shawn Milochik
@@ -433,6 +460,7 @@
Gregor Müllegger
Robin Munn
James Murty
+ Rudy Mutter
msundstr
Robert Myers
Aaron T. Myers
@@ -448,6 +476,7 @@
Neal Norwitz
Todd O'Bryan
Alex Ogier
+ Joao Oliveira
Selwin Ong
Gerardo Orozco
Christian Oudard
@@ -460,6 +489,7 @@
John Paulett
pavithran s
Barry Pederson
+ Berker Peksag
Andreas Pelme
permonik@mesias.brnonet.cz
peter@mymart.com
@@ -475,10 +505,10 @@
plisk
Daniel Poelzleithner
Dan Poirier
+ Garry Polley
polpak@yahoo.com
Ross Poulton
Mihai Preda
- Daniele Procida
Matthias Pronk
Jyrki Pulliainen
Thejaswi Puthraya
@@ -519,6 +549,9 @@
Ivan Sagalaev (Maniac)
Vinay Sajip
Bartolome Sanchez Salado
+ Nick Sandford
+ Mark Sandstrom
+ Lee Sanghyuck
Kadesarin Sanjek
Tim Saylor
Massimo Scamarcia
@@ -532,13 +565,17 @@
Aleksandra Sendecka
serbaut@gmail.com
John Shaffer
+ Peter Sheats
Pete Shinners
Leo Shklovskii
+ Zbigniew Siciarz
jason.sidabras@gmail.com
Mikołaj Siedlarek
+ Karol Sikora
Brenton Simpson
Jozko Skrablin
Ben Slavin
+ Jonathan Slenders
sloonz
Paul Smith
Steven L. Smith (fvox13)
@@ -549,6 +586,7 @@
Jimmy Song
sopel
Leo Soto
+ Thomas Sorrel
Wiliam Alves de Souza
Don Spaulding
Calvin Spealman
@@ -574,6 +612,7 @@
Aaron Swartz
Ville Säävuori
Mart Sõmermaa
+ Susan Tan
Christian Tanzer
Tyler Tarabula
Tyson Tate
@@ -616,6 +655,7 @@
Rick Wagner
Gavin Wahl
wam-djangobug@wamber.net
+ Albert Wang
Wang Chun
Filip Wasilewski
Dan Watson
@@ -633,9 +673,11 @@
Rachel Willmer
Jakub Wilk
Ian A Wilson
+ Chris Wilson
Jakub Wiśniowski
Maciej Wiśniowski
wojtek
+ Colin Wood
Marcin Wróbel
Jason Yan
Lars Yencken
@@ -644,6 +686,7 @@
Jesse Young
Marc Aymerich Gubern
Wiktor Kołodziej
+ Unai Zalakain
Mykola Zamkovoi
zegor
Gasper Zejn
diff -Nru python-django-1.6.6/debian/changelog python-django-1.7.4/debian/changelog
--- python-django-1.6.6/debian/changelog 2015-01-13 19:31:28.000000000 +0000
+++ python-django-1.7.4/debian/changelog 2015-03-03 19:44:53.000000000 +0000
@@ -1,3 +1,143 @@
+python-django (1.7.4-1ubuntu1) vivid; urgency=medium
+
+ * Merge with Debian; remaining changes:
+ - debian/patches/99_fix_multipart_base64_decoding_large_files.patch:
+ Fix Multipart base64 file decoding with large files ensuring that the
+ actual base64 content has a length a multiple of 4.
+
+ -- Matthias Klose Tue, 03 Mar 2015 20:34:47 +0100
+
+python-django (1.7.4-1) unstable; urgency=medium
+
+ * Release to unstable and hopefully to Jessie too.
+
+ -- Raphaël Hertzog Mon, 09 Feb 2015 10:39:15 +0100
+
+python-django (1.7.4-1~exp1) experimental; urgency=medium
+
+ * New upstream bugfix release.
+ * Drop fix-24193-python34-test-failure.diff, merged upstream.
+
+ -- Raphaël Hertzog Wed, 28 Jan 2015 09:38:24 +0100
+
+python-django (1.7.3-1~exp1) experimental; urgency=high
+
+ [ Luke Faraone ]
+ * New upstream security release.
+ - WSGI header spoofing via underscore/dash conflation (CVE-2015-0219)
+ - Possible XSS attack via user-supplied redirect URLs (CVE-2015-0220)
+ - DoS attack against django.views.static.serve (CVE-2015-0221)
+ - Database DoS with ModelMultipleChoiceField (CVE-2015-0222)
+ Closes: #775375
+
+ [ Raphaël Hertzog ]
+ * Add patch fix-24193-python34-test-failure.diff to fix a test failure with
+ Python3.4.
+
+ -- Raphaël Hertzog Wed, 21 Jan 2015 09:56:19 +0100
+
+python-django (1.7.2-1) experimental; urgency=medium
+
+ [ Raphaël Hertzog ]
+ * Add geoip-database-extra as an alternative to geoip-database-contrib.
+
+ [ Brian May ]
+ * New upstream version.
+
+ -- Brian May Mon, 05 Jan 2015 13:57:16 +1100
+
+python-django (1.7.1-1) unstable; urgency=medium
+
+ [ Raphaël Hertzog ]
+ * New upstream bugfix release.
+ * Drop 01_fix_test_loaddata_not_existant_fixture_file.patch, merged
+ upstream.
+ * Update Standards-Version to 3.9.6.
+ * Add lintian overrides for package-contains-timestamped-gzip (false
+ positive).
+
+ [ Brian May ]
+ * Fix django-admin wrapper to not even consider using python 2.6 as
+ that version is unsupported with Django 1.7.
+
+ -- Raphaël Hertzog Mon, 27 Oct 2014 16:37:41 +0100
+
+python-django (1.7-3) unstable; urgency=medium
+
+ * Add 01_fix_test_loaddata_not_existant_fixture_file.patch
+ to fix FTBFS with Python 3.4.2. Closes: #765117
+ * Improve migrate-south script to look for Python files in the current dir.
+ ./manage.py implicitely has the current directory but when we use
+ django-admin it's not the case. Thanks to Uwe Kleine-Koenig for the
+ report.
+
+ -- Raphaël Hertzog Wed, 15 Oct 2014 10:45:27 +0200
+
+python-django (1.7-2) unstable; urgency=medium
+
+ * Release to unstable.
+ * Add a migrate-south sample script to help users apply their South
+ migrations. Thanks to Brian May.
+
+ -- Raphaël Hertzog Wed, 17 Sep 2014 14:15:11 +0200
+
+python-django (1.7-1) experimental; urgency=medium
+
+ * New major upstream release.
+ * Add a NEWS file to document the incompatibility with South.
+
+ -- Raphaël Hertzog Mon, 08 Sep 2014 10:19:12 +0200
+
+python-django (1.7~c3-1) experimental; urgency=medium
+
+ * New upstream release candidate with security fixes:
+ https://www.djangoproject.com/weblog/2014/aug/20/security/
+
+ -- Raphaël Hertzog Fri, 22 Aug 2014 22:50:32 +0200
+
+python-django (1.7~c2-2) experimental; urgency=medium
+
+ * Merge changes from 1.6.5-4:
+ * Don't output stuff to stdout in django-admin. Closes: #757145
+ * Update Vcs-* fields since the packaging repository moved to git.
+
+ -- Raphaël Hertzog Fri, 08 Aug 2014 14:26:47 +0200
+
+python-django (1.7~c2-1) experimental; urgency=medium
+
+ * New upstream release candidate.
+
+ -- Raphaël Hertzog Wed, 30 Jul 2014 20:47:10 +0200
+
+python-django (1.7~c1+20140722-2) experimental; urgency=medium
+
+ * Move django-admin manual page in python-django-common. Bump version
+ constraint in Breaks/Replaces accordingly.
+ * Drop conflicting django-admin in python-django and python3-django that
+ were not removed as usual because upstream stopped installing them as
+ django-admin.py.
+ * Drop extra license files.
+ * Fix shebang lines in python3-django.
+ * Drop empty left-over /usr/bin directories in python-django/python3-django.
+
+ -- Raphaël Hertzog Tue, 22 Jul 2014 23:29:30 +0200
+
+python-django (1.7~c1+20140722-1) experimental; urgency=medium
+
+ * New upstream release candidate. We want this version in jessie so we
+ should prepare now.
+ * Snapshot tarball generated with "python setup.py sdist" after having
+ applied fix submitted in https://code.djangoproject.com/ticket/23072
+ * Added python-sqlparse, python-tz to Recommends
+ * Added other optional dependencies (python-memcache, python-pil,
+ python-bcrypt) to Suggests
+ * Add all those dependencies in Build-Depends for the benefit of the
+ test suite.
+ * Run the test suite for python2 and python3.
+ * Differentiate descriptions of python2 and python3 packages.
+
+ -- Raphaël Hertzog Mon, 21 Jul 2014 21:57:07 +0200
+
python-django (1.6.6-1ubuntu3) vivid; urgency=medium
* SECURITY UPDATE: WSGI header spoofing via underscore/dash conflation
diff -Nru python-django-1.6.6/debian/contrib/migrate-south python-django-1.7.4/debian/contrib/migrate-south
--- python-django-1.6.6/debian/contrib/migrate-south 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/debian/contrib/migrate-south 2015-02-09 09:39:56.000000000 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+TMPDIR=$(mktemp -d)
+trap "rm -rf -- '$TMPDIR'" EXIT HUP INT TERM
+
+virtualenv --system-site-packages "$TMPDIR"
+. "$TMPDIR/bin/activate"
+
+pip install django==1.6.5
+pip install south
+
+CMD="$(command -v django-admin)"
+PYTHONPATH="$PWD" python "$CMD" migrate "$@"
diff -Nru python-django-1.6.6/debian/control python-django-1.7.4/debian/control
--- python-django-1.6.6/debian/control 2014-09-18 22:39:44.000000000 +0000
+++ python-django-1.7.4/debian/control 2015-03-03 19:37:06.000000000 +0000
@@ -7,19 +7,31 @@
Raphaël Hertzog ,
Chris Lamb ,
Brian May
-Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3~), python3-all, python-sphinx (>= 1.0.8), locales (>= 0)
+Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3~), python3-all, python-sphinx (>= 1.0.8), locales (>= 0),
+# Needed to enable supplementary tests in test suite
+ python-bcrypt, python3-bcrypt,
+ python-docutils, python3-docutils,
+ python-numpy, python3-numpy,
+ python-pil, python3-pil,
+ python-yaml, python3-yaml,
+ python-tz, python3-tz,
+ python-setuptools, python3-setuptools,
+# python-memcache, python3-memcache, memcached, # we can't rely on running daemon
+ python-sqlparse, python3-sqlparse,
+# python-selenium in theory too... but it's not properly packaged
Build-Depends-Indep: libjs-jquery
Homepage: http://www.djangoproject.com/
Vcs-Git: git://anonscm.debian.org/python-modules/packages/python-django.git
Vcs-Browser: http://anonscm.debian.org/cgit/python-modules/packages/python-django.git
+X-Python-Version: >= 2.7
Package: python-django
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-django-common (= ${binary:Version})
-Recommends: libjs-jquery
-Suggests: python-psycopg2, python-mysqldb, python-flup, python-sqlite, python-yaml, geoip-database-contrib, gettext, python-django-doc, ipython, bpython, libgdal1
-Description: High-level Python web development framework
+Recommends: libjs-jquery, python-sqlparse, python-tz
+Suggests: python-psycopg2, python-mysqldb, python-flup, python-sqlite, python-memcache, python-pil, python-bcrypt, python-yaml, geoip-database-extra | geoip-database-contrib, gettext, python-django-doc, ipython, bpython, libgdal1
+Description: High-level Python web development framework (Python 2 version)
Django is a high-level web application framework that loosely follows the
model-view-controller design pattern.
.
@@ -40,13 +52,15 @@
* Lightweight, standalone web server for development and testing
* Internationalization support
* Testing framework and client
+ .
+ This package is built for Python 2.
Package: python3-django
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends}, python-django-common (= ${binary:Version})
-Recommends: libjs-jquery
-Suggests: python3-psycopg2, python3-mysqldb, python3-flup, python3-sqlite, python3-yaml, geoip-database-contrib, gettext, python-django-doc, ipython3, bpython3, libgdal1
-Description: High-level Python web development framework
+Recommends: libjs-jquery, python3-sqlparse, python3-tz
+Suggests: python3-psycopg2, python3-mysqldb, python3-flup, python3-sqlite, python3-memcache, python3-pil, python3-bcrypt, python3-yaml, geoip-database-contrib, gettext, python-django-doc, ipython3, bpython3, libgdal1
+Description: High-level Python web development framework (Python 3 version)
Django is a high-level web application framework that loosely follows the
model-view-controller design pattern.
.
@@ -67,13 +81,15 @@
* Lightweight, standalone web server for development and testing
* Internationalization support
* Testing framework and client
+ .
+ This package is built for Python 3.
Package: python-django-common
Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends: ${misc:Depends}
Recommends: libjs-jquery
-Breaks: python-django (<< 1.6.5-2~)
-Replaces: python-django (<< 1.6.5-2~)
+Breaks: python-django (<< 1.7~)
+Replaces: python-django (<< 1.7~)
Description: High-level Python web development framework (common)
Django is a high-level web application framework that loosely follows the
model-view-controller design pattern.
diff -Nru python-django-1.6.6/debian/django-admin python-django-1.7.4/debian/django-admin
--- python-django-1.6.6/debian/django-admin 2014-08-21 02:29:40.000000000 +0000
+++ python-django-1.7.4/debian/django-admin 2015-02-09 09:39:56.000000000 +0000
@@ -7,9 +7,6 @@
elif command -v python2.7 > /dev/null && test -e /usr/lib/python2.7/dist-packages/django/bin/django-admin.py
then
exec python2.7 "$0" "$@"
-elif command -v python2.6 > /dev/null && test -e /usr/lib/python2.6/dist-packages/django/bin/django-admin.py
-then
- exec python2.6 "$0" "$@"
else
echo "Cannot find installed version of python-django or python3-django." >&2
exit 1
diff -Nru python-django-1.6.6/debian/gbp.conf python-django-1.7.4/debian/gbp.conf
--- python-django-1.6.6/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/debian/gbp.conf 2015-02-09 09:39:56.000000000 +0000
@@ -0,0 +1,3 @@
+[DEFAULT]
+upstream-branch=upstream/1.7.x
+debian-branch=debian/sid
diff -Nru python-django-1.6.6/debian/patches/02_disable-sources-in-sphinxdoc.diff python-django-1.7.4/debian/patches/02_disable-sources-in-sphinxdoc.diff
--- python-django-1.6.6/debian/patches/02_disable-sources-in-sphinxdoc.diff 2014-08-21 02:29:40.000000000 +0000
+++ python-django-1.7.4/debian/patches/02_disable-sources-in-sphinxdoc.diff 2015-02-09 09:39:56.000000000 +0000
@@ -9,7 +9,7 @@
--- a/docs/conf.py
+++ b/docs/conf.py
-@@ -185,7 +185,10 @@ html_additional_pages = {}
+@@ -196,7 +196,10 @@ html_additional_pages = {}
#html_split_index = False
# If true, links to the reST sources are added to the pages.
diff -Nru python-django-1.6.6/debian/patches/06_use_debian_geoip_database_as_default.diff python-django-1.7.4/debian/patches/06_use_debian_geoip_database_as_default.diff
--- python-django-1.6.6/debian/patches/06_use_debian_geoip_database_as_default.diff 2014-08-21 02:29:40.000000000 +0000
+++ python-django-1.7.4/debian/patches/06_use_debian_geoip_database_as_default.diff 2015-02-09 09:39:56.000000000 +0000
@@ -9,7 +9,7 @@
--- a/django/contrib/gis/geoip/base.py
+++ b/django/contrib/gis/geoip/base.py
-@@ -64,7 +64,8 @@
+@@ -67,7 +67,8 @@ class GeoIP(object):
* path: Base directory to where GeoIP data is located or the full path
to where the city or country data files (*.dat) are located.
Assumes that both the city and country data sets are located in
@@ -19,7 +19,7 @@
* cache: The cache settings when opening up the GeoIP datasets,
and may be an integer in (0, 1, 2, 4, 8) corresponding to
-@@ -73,11 +74,13 @@
+@@ -76,11 +77,13 @@ class GeoIP(object):
settings, respectively. Defaults to 0, meaning that the data is read
from the disk.
@@ -38,17 +38,18 @@
"""
# Checking the given cache option.
if cache in self.cache_options:
-@@ -87,8 +90,7 @@
+@@ -90,9 +93,7 @@ class GeoIP(object):
# Getting the GeoIP data path.
if not path:
- path = GEOIP_SETTINGS.get('GEOIP_PATH', None)
-- if not path: raise GeoIPException('GeoIP path must be provided via parameter or the GEOIP_PATH setting.')
+- if not path:
+- raise GeoIPException('GeoIP path must be provided via parameter or the GEOIP_PATH setting.')
+ path = GEOIP_SETTINGS.get('GEOIP_PATH', '/usr/share/GeoIP')
if not isinstance(path, six.string_types):
raise TypeError('Invalid path type: %s' % type(path).__name__)
-@@ -101,7 +103,7 @@
+@@ -105,7 +106,7 @@ class GeoIP(object):
self._country = GeoIP_open(force_bytes(country_db), cache)
self._country_file = country_db
diff -Nru python-django-1.6.6/debian/patches/99_fix_multipart_base64_decoding_large_files.patch python-django-1.7.4/debian/patches/99_fix_multipart_base64_decoding_large_files.patch
--- python-django-1.6.6/debian/patches/99_fix_multipart_base64_decoding_large_files.patch 2014-09-18 22:37:44.000000000 +0000
+++ python-django-1.7.4/debian/patches/99_fix_multipart_base64_decoding_large_files.patch 2015-03-03 19:40:35.000000000 +0000
@@ -6,9 +6,11 @@
Bug-Ubuntu: https://bugs.launchpad.net/maas/+bug/1363348
Author: Jason Hobbs
---- python-django-1.6.6.orig/django/http/multipartparser.py 2014-09-18 17:30:56.764078351 -0500
-+++ python-django-1.6.6/django/http/multipartparser.py 2014-09-18 17:31:38.020079923 -0500
-@@ -201,14 +201,19 @@
+Index: b/django/http/multipartparser.py
+===================================================================
+--- a/django/http/multipartparser.py
++++ b/django/http/multipartparser.py
+@@ -205,14 +205,19 @@ class MultiPartParser(object):
for chunk in field_stream:
if transfer_encoding == 'base64':
# We only special-case base64 transfer encoding
@@ -34,11 +36,11 @@
except Exception as e:
# Since this is only a chunk, any error is an unfixable error.
msg = "Could not decode base64 data: %r" % e
-Index: python-django-1.6.6/tests/file_uploads/tests.py
+Index: b/tests/file_uploads/tests.py
===================================================================
---- python-django-1.6.6.orig/tests/file_uploads/tests.py 2014-09-18 17:30:56.764078351 -0500
-+++ python-django-1.6.6/tests/file_uploads/tests.py 2014-09-18 17:32:33.992082056 -0500
-@@ -74,14 +74,14 @@
+--- a/tests/file_uploads/tests.py
++++ b/tests/file_uploads/tests.py
+@@ -77,14 +77,14 @@ class FileUploadTests(TestCase):
self.assertEqual(response.status_code, 200)
@@ -49,13 +51,13 @@
'Content-Disposition: form-data; name="file"; filename="test.txt"',
'Content-Type: application/octet-stream',
'Content-Transfer-Encoding: base64',
- '',]))
+ '']))
- payload.write(b"\r\n" + base64.b64encode(force_bytes(content)) + b"\r\n")
+ payload.write(b"\r\n" + encode(force_bytes(content)) + b"\r\n")
payload.write('--' + client.BOUNDARY + '--\r\n')
r = {
'CONTENT_LENGTH': len(payload),
-@@ -101,6 +101,10 @@
+@@ -104,6 +104,10 @@ class FileUploadTests(TestCase):
def test_big_base64_upload(self):
self._test_base64_upload("Big data" * 68000) # > 512Kb
diff -Nru python-django-1.6.6/debian/patches/CVE-2015-0219.patch python-django-1.7.4/debian/patches/CVE-2015-0219.patch
--- python-django-1.6.6/debian/patches/CVE-2015-0219.patch 2015-01-13 12:35:07.000000000 +0000
+++ python-django-1.7.4/debian/patches/CVE-2015-0219.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-Description: fix WSGI header spoofing via underscore/dash conflation
-Author: Carl Meyer
-
-Index: python-django-1.6.6/django/core/servers/basehttp.py
-===================================================================
---- python-django-1.6.6.orig/django/core/servers/basehttp.py 2014-08-20 16:13:48.000000000 -0400
-+++ python-django-1.6.6/django/core/servers/basehttp.py 2015-01-13 07:29:56.142523243 -0500
-@@ -157,6 +157,17 @@
-
- sys.stderr.write(msg)
-
-+ def get_environ(self):
-+ # Strip all headers with underscores in the name before constructing
-+ # the WSGI environ. This prevents header-spoofing based on ambiguity
-+ # between underscores and dashes both normalized to underscores in WSGI
-+ # env vars. Nginx and Apache 2.4+ both do this as well.
-+ for k, v in self.headers.items():
-+ if '_' in k:
-+ del self.headers[k]
-+
-+ return super(WSGIRequestHandler, self).get_environ()
-+
-
- def run(addr, port, wsgi_handler, ipv6=False, threading=False):
- server_address = (addr, port)
-Index: python-django-1.6.6/docs/howto/auth-remote-user.txt
-===================================================================
---- python-django-1.6.6.orig/docs/howto/auth-remote-user.txt 2014-08-20 16:13:48.000000000 -0400
-+++ python-django-1.6.6/docs/howto/auth-remote-user.txt 2015-01-13 07:29:56.142523243 -0500
-@@ -64,6 +64,22 @@
- class CustomHeaderMiddleware(RemoteUserMiddleware):
- header = 'HTTP_AUTHUSER'
-
-+.. warning::
-+
-+ Be very careful if using a ``RemoteUserMiddleware`` subclass with a custom
-+ HTTP header. You must be sure that your front-end web server always sets or
-+ strips that header based on the appropriate authentication checks, never
-+ permitting an end-user to submit a fake (or "spoofed") header value. Since
-+ the HTTP headers ``X-Auth-User`` and ``X-Auth_User`` (for example) both
-+ normalize to the ``HTTP_X_AUTH_USER`` key in ``request.META``, you must
-+ also check that your web server doesn't allow a spoofed header using
-+ underscores in place of dashes.
-+
-+ This warning doesn't apply to ``RemoteUserMiddleware`` in its default
-+ configuration with ``header = 'REMOTE_USER'``, since a key that doesn't
-+ start with ``HTTP_`` in ``request.META`` can only be set by your WSGI
-+ server, not directly from an HTTP request header.
-+
- If you need more control, you can create your own authentication backend
- that inherits from :class:`~django.contrib.auth.backends.RemoteUserBackend` and
- override one or more of its attributes and methods.
-Index: python-django-1.6.6/tests/servers/test_basehttp.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ python-django-1.6.6/tests/servers/test_basehttp.py 2015-01-13 07:29:56.142523243 -0500
-@@ -0,0 +1,67 @@
-+import sys
-+
-+from django.core.servers.basehttp import WSGIRequestHandler
-+from django.test import TestCase
-+from django.utils.six import BytesIO, StringIO
-+
-+
-+class Stub(object):
-+ def __init__(self, **kwargs):
-+ self.__dict__.update(kwargs)
-+
-+
-+class WSGIRequestHandlerTestCase(TestCase):
-+
-+ def test_strips_underscore_headers(self):
-+ """WSGIRequestHandler ignores headers containing underscores.
-+
-+ This follows the lead of nginx and Apache 2.4, and is to avoid
-+ ambiguity between dashes and underscores in mapping to WSGI environ,
-+ which can have security implications.
-+ """
-+ def test_app(environ, start_response):
-+ """A WSGI app that just reflects its HTTP environ."""
-+ start_response('200 OK', [])
-+ http_environ_items = sorted(
-+ '%s:%s' % (k, v) for k, v in environ.items()
-+ if k.startswith('HTTP_')
-+ )
-+ yield (','.join(http_environ_items)).encode('utf-8')
-+
-+ rfile = BytesIO()
-+ rfile.write(b"GET / HTTP/1.0\r\n")
-+ rfile.write(b"Some-Header: good\r\n")
-+ rfile.write(b"Some_Header: bad\r\n")
-+ rfile.write(b"Other_Header: bad\r\n")
-+ rfile.seek(0)
-+
-+ # WSGIRequestHandler closes the output file; we need to make this a
-+ # no-op so we can still read its contents.
-+ class UnclosableBytesIO(BytesIO):
-+ def close(self):
-+ pass
-+
-+ wfile = UnclosableBytesIO()
-+
-+ def makefile(mode, *a, **kw):
-+ if mode == 'rb':
-+ return rfile
-+ elif mode == 'wb':
-+ return wfile
-+
-+ request = Stub(makefile=makefile)
-+ server = Stub(base_environ={}, get_app=lambda: test_app)
-+
-+ # We don't need to check stderr, but we don't want it in test output
-+ old_stderr = sys.stderr
-+ sys.stderr = StringIO()
-+ try:
-+ # instantiating a handler runs the request as side effect
-+ WSGIRequestHandler(request, '192.168.0.2', server)
-+ finally:
-+ sys.stderr = old_stderr
-+
-+ wfile.seek(0)
-+ body = list(wfile.readlines())[-1]
-+
-+ self.assertEqual(body, b'HTTP_SOME_HEADER:good')
diff -Nru python-django-1.6.6/debian/patches/CVE-2015-0220.patch python-django-1.7.4/debian/patches/CVE-2015-0220.patch
--- python-django-1.6.6/debian/patches/CVE-2015-0220.patch 2015-01-13 12:36:44.000000000 +0000
+++ python-django-1.7.4/debian/patches/CVE-2015-0220.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-Description: fix mitigated possible XSS attack via user-supplied redirect URLs
-Author: Tim Graham
-
-Index: python-django-1.6.6/django/utils/http.py
-===================================================================
---- python-django-1.6.6.orig/django/utils/http.py 2014-08-20 16:13:48.000000000 -0400
-+++ python-django-1.6.6/django/utils/http.py 2015-01-13 07:30:50.854918976 -0500
-@@ -256,6 +256,7 @@
- """
- if not url:
- return False
-+ url = url.strip()
- # Chrome treats \ completely as /
- url = url.replace('\\', '/')
- # Chrome considers any URL with more than two slashes to be absolute, but
-Index: python-django-1.6.6/tests/utils_tests/test_http.py
-===================================================================
---- python-django-1.6.6.orig/tests/utils_tests/test_http.py 2014-08-20 16:13:48.000000000 -0400
-+++ python-django-1.6.6/tests/utils_tests/test_http.py 2015-01-13 07:30:50.854918976 -0500
-@@ -109,7 +109,8 @@
- 'http:/\//example.com',
- 'http:\/example.com',
- 'http:/\example.com',
-- 'javascript:alert("XSS")'):
-+ 'javascript:alert("XSS")',
-+ '\njavascript:alert(x)'):
- self.assertFalse(http.is_safe_url(bad_url, host='testserver'), "%s should be blocked" % bad_url)
- for good_url in ('/view/?param=http://example.com',
- '/view/?param=https://example.com',
diff -Nru python-django-1.6.6/debian/patches/CVE-2015-0221.patch python-django-1.7.4/debian/patches/CVE-2015-0221.patch
--- python-django-1.6.6/debian/patches/CVE-2015-0221.patch 2015-01-13 12:38:53.000000000 +0000
+++ python-django-1.7.4/debian/patches/CVE-2015-0221.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-Description: fix denial-of-service attack against django.views.static.serve
-Author: Tim Graham
-
-Index: python-django-1.6.6/django/views/static.py
-===================================================================
---- python-django-1.6.6.orig/django/views/static.py 2014-08-20 16:13:48.000000000 -0400
-+++ python-django-1.6.6/django/views/static.py 2015-01-13 07:31:42.007288607 -0500
-@@ -17,6 +17,9 @@
- from django.utils.six.moves.urllib.parse import unquote
- from django.utils.translation import ugettext as _, ugettext_noop
-
-+STREAM_CHUNK_SIZE = 4096
-+
-+
- def serve(request, path, document_root=None, show_indexes=False):
- """
- Serve static files below a given point in the directory structure.
-@@ -60,7 +63,8 @@
- return HttpResponseNotModified()
- content_type, encoding = mimetypes.guess_type(fullpath)
- content_type = content_type or 'application/octet-stream'
-- response = CompatibleStreamingHttpResponse(open(fullpath, 'rb'),
-+ f = open(fullpath, 'rb')
-+ response = CompatibleStreamingHttpResponse(iter(lambda: f.read(STREAM_CHUNK_SIZE), b''),
- content_type=content_type)
- response["Last-Modified"] = http_date(statobj.st_mtime)
- if stat.S_ISREG(statobj.st_mode):
-Index: python-django-1.6.6/tests/view_tests/media/long-line.txt
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ python-django-1.6.6/tests/view_tests/media/long-line.txt 2015-01-13 07:31:42.007288607 -0500
-@@ -0,0 +1 @@
-+lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore et dolore magna aliqua hic tempora est veritatis culpa fugiat doloribus fugit in sed harum veniam porro eveniet maxime labore assumenda non illum possimus aut vero laudantium cum magni numquam dolorem explicabo quidem quasi nesciunt ipsum deleniti facilis neque similique nisi ad magnam accusamus quae provident dolor ab atque modi laboriosam fuga suscipit ea beatae ipsam consequatur saepe dolore nulla error quo iusto expedita nemo commodi aspernatur aliquam enim reiciendis rerum necessitatibus recusandae sint amet placeat temporibus autem iste deserunt esse dolores reprehenderit doloremque pariatur velit maiores repellat dignissimos asperiores aperiam alias a corporis id praesentium voluptatibus soluta voluptatem sit molestiae quas odio facere nostrum laborum incidunt eaque nihil ullam rem mollitia at cumque iure tenetur tempore totam repudiandae quisquam quod architecto officia vitae consectetur cupiditate molestias delectus voluptates earum et impedit quibusdam odit sequi perferendis eius perspiciatis eos quam quaerat officiis sunt ratione consequuntur quia quis obcaecati repellendus exercitationem vel minima libero blanditiis eligendi minus dicta voluptas excepturi nam eum inventore voluptatum ducimus sapiente dolorum itaque ipsa qui omnis debitis voluptate quos aliquid accusantium ex illo corrupti ut adipisci natus animi distinctio optio nobis unde similique excepturi vero culpa molestias fugit dolorum non amet iure inventore nihil suscipit explicabo veritatis officiis distinctio nesciunt saepe incidunt reprehenderit porro vitae cumque alias ut deleniti expedita ratione odio magnam eligendi a nostrum laborum minus esse sit libero quaerat qui id illo voluptates soluta neque odit dolore consectetur ducimus nulla est nisi impedit quia sapiente ullam temporibus ipsam repudiandae delectus fugiat blanditiis maxime voluptatibus aspernatur ea ipsum quisquam sunt eius ipsa accusantium enim corporis earum sed sequi dicta accusamus dignissimos illum pariatur quos aut reiciendis obcaecati perspiciatis consequuntur nam modi praesentium cum repellat possimus iste atque quidem architecto recusandae harum eaque sint quae optio voluptate quod quasi beatae magni necessitatibus facilis aperiam repellendus nemo aliquam et quibusdam debitis itaque cupiditate laboriosam unde tempora commodi laudantium in placeat ad vel maiores aliquid hic tempore provident quas officia adipisci rem corrupti iusto natus eum rerum at ex quam eveniet totam dolor assumenda error eos doloribus labore fuga facere deserunt ab dolores consequatur veniam animi exercitationem asperiores mollitia minima numquam voluptatem voluptatum nobis molestiae voluptas omnis velit quis quo tenetur perferendis autem dolorem doloremque sequi vitae laudantium magnam quae adipisci expedita doloribus minus perferendis vero animi at quos iure facere nihil veritatis consectetur similique porro tenetur nobis fugiat quo ducimus qui soluta maxime placeat error sunt ullam quaerat provident eos minima ab harum ratione inventore unde sint dolorum deserunt veniam laborum quasi suscipit facilis eveniet voluptatibus est ipsum sapiente omnis vel repellat perspiciatis illo voluptate aliquid magni alias modi odit ea a voluptatem reiciendis recusandae mollitia eius distinctio amet atque voluptates obcaecati deleniti eligendi commodi debitis dolore laboriosam nam illum pariatur earum exercitationem velit in quas explicabo fugit asperiores itaque quam sit dolorem beatae quod cumque necessitatibus tempora dolores hic aperiam ex tempore ut neque maiores ad dicta voluptatum eum officia assumenda reprehenderit nisi cum molestiae et iusto quidem consequuntur repellendus saepe corrupti numquam culpa rerum incidunt dolor impedit iste sed non praesentium ipsam consequatur eaque possimus quia quibusdam excepturi aspernatur voluptas quisquam autem molestias aliquam corporis delectus nostrum labore nesciunt blanditiis quis enim accusamus nulla architecto fuga natus ipsa repudiandae cupiditate temporibus aut libero optio id officiis esse dignissimos odio totam doloremque accusantium nemo rem repudiandae aliquam accusamus autem minima reiciendis debitis quis ut ducimus quas dolore ratione neque velit repellat natus est error ea nam consequuntur rerum excepturi aspernatur quaerat cumque voluptatibus rem quasi eos unde architecto animi sunt veritatis delectus nulla at iusto repellendus dolorum obcaecati commodi earum assumenda quisquam cum officiis modi ab tempora harum vitae voluptatem explicabo alias maxime nostrum iure consectetur incidunt laudantium distinctio deleniti iste facere fugit libero illo nobis expedita perferendis labore similique beatae sint dicta dignissimos sapiente dolor soluta perspiciatis aut ad illum facilis totam necessitatibus eveniet temporibus reprehenderit quidem fugiat magni dolorem doloribus quibusdam eligendi fuga quae recusandae eum amet dolores asperiores voluptas inventore officia sit vel id vero nihil optio nisi magnam deserunt odit corrupti adipisci aliquid odio enim pariatur cupiditate suscipit voluptatum corporis porro mollitia eaque quia non quod consequatur ipsa nesciunt itaque exercitationem molestias molestiae atque in numquam quo ipsam nemo ex tempore ipsum saepe esse sed veniam a voluptates placeat accusantium quos laboriosam voluptate provident hic sequi quam doloremque eius impedit omnis possimus laborum tenetur praesentium et minus ullam blanditiis culpa qui aperiam maiores quidem numquam nulla
-Index: python-django-1.6.6/tests/view_tests/tests/test_static.py
-===================================================================
---- python-django-1.6.6.orig/tests/view_tests/tests/test_static.py 2014-08-20 16:13:48.000000000 -0400
-+++ python-django-1.6.6/tests/view_tests/tests/test_static.py 2015-01-13 07:31:42.007288607 -0500
-@@ -9,7 +9,7 @@
- from django.test import TestCase
- from django.test.utils import override_settings
- from django.utils.http import http_date
--from django.views.static import was_modified_since
-+from django.views.static import was_modified_since, STREAM_CHUNK_SIZE
-
- from .. import urls
- from ..urls import media_dir
-@@ -33,6 +33,14 @@
- self.assertEqual(len(response_content), int(response['Content-Length']))
- self.assertEqual(mimetypes.guess_type(file_path)[1], response.get('Content-Encoding', None))
-
-+ def test_chunked(self):
-+ "The static view should stream files in chunks to avoid large memory usage"
-+ response = self.client.get('/views/%s/%s' % (self.prefix, 'long-line.txt'))
-+ first_chunk = next(response.streaming_content)
-+ self.assertEqual(len(first_chunk), STREAM_CHUNK_SIZE)
-+ second_chunk = next(response.streaming_content)
-+ self.assertEqual(len(second_chunk), 1451)
-+
- def test_unknown_mime_type(self):
- response = self.client.get('/views/%s/file.unknown' % self.prefix)
- self.assertEqual('application/octet-stream', response['Content-Type'])
diff -Nru python-django-1.6.6/debian/patches/CVE-2015-0222.patch python-django-1.7.4/debian/patches/CVE-2015-0222.patch
--- python-django-1.6.6/debian/patches/CVE-2015-0222.patch 2015-01-13 12:40:21.000000000 +0000
+++ python-django-1.7.4/debian/patches/CVE-2015-0222.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-Description: fix database denial-of-service with ModelMultipleChoiceField
-Author: Tim Graham
-
-Index: python-django-1.6.6/django/forms/models.py
-===================================================================
---- python-django-1.6.6.orig/django/forms/models.py 2014-08-20 16:13:48.000000000 -0400
-+++ python-django-1.6.6/django/forms/models.py 2015-01-13 07:32:28.351623206 -0500
-@@ -1174,8 +1174,7 @@
- def to_python(self, value):
- if not value:
- return []
-- to_py = super(ModelMultipleChoiceField, self).to_python
-- return [to_py(val) for val in value]
-+ return list(self._check_values(value))
-
- def clean(self, value):
- if self.required and not value:
-@@ -1184,7 +1183,29 @@
- return self.queryset.none()
- if not isinstance(value, (list, tuple)):
- raise ValidationError(self.error_messages['list'], code='list')
-+ qs = self._check_values(value)
-+ # Since this overrides the inherited ModelChoiceField.clean
-+ # we run custom validators here
-+ self.run_validators(value)
-+ return qs
-+
-+ def _check_values(self, value):
-+ """
-+ Given a list of possible PK values, returns a QuerySet of the
-+ corresponding objects. Raises a ValidationError if a given value is
-+ invalid (not a valid PK, not in the queryset, etc.)
-+ """
- key = self.to_field_name or 'pk'
-+ # deduplicate given values to avoid creating many querysets or
-+ # requiring the database backend deduplicate efficiently.
-+ try:
-+ value = frozenset(value)
-+ except TypeError:
-+ # list of lists isn't hashable, for example
-+ raise ValidationError(
-+ self.error_messages['list'],
-+ code='list',
-+ )
- for pk in value:
- try:
- self.queryset.filter(**{key: pk})
-@@ -1203,9 +1224,6 @@
- code='invalid_choice',
- params={'value': val},
- )
-- # Since this overrides the inherited ModelChoiceField.clean
-- # we run custom validators here
-- self.run_validators(value)
- return qs
-
- def prepare_value(self, value):
-Index: python-django-1.6.6/tests/model_forms/tests.py
-===================================================================
---- python-django-1.6.6.orig/tests/model_forms/tests.py 2014-08-20 16:13:48.000000000 -0400
-+++ python-django-1.6.6/tests/model_forms/tests.py 2015-01-13 07:32:28.351623206 -0500
-@@ -1381,6 +1381,27 @@
-
-
''' % (w_woodward.pk, w_bernstein.pk, bw.pk, w_royko.pk))
-
-+ def test_show_hidden_initial_changed_queries_efficiently(self):
-+ class WriterForm(forms.Form):
-+ persons = forms.ModelMultipleChoiceField(
-+ show_hidden_initial=True, queryset=Writer.objects.all())
-+
-+ writers = (Writer.objects.create(name=str(x)) for x in range(0, 50))
-+ writer_pks = tuple(x.pk for x in writers)
-+ form = WriterForm(data={'initial-persons': writer_pks})
-+ with self.assertNumQueries(1):
-+ self.assertTrue(form.has_changed())
-+
-+ def test_clean_does_deduplicate_values(self):
-+ class WriterForm(forms.Form):
-+ persons = forms.ModelMultipleChoiceField(queryset=Writer.objects.all())
-+
-+ person1 = Writer.objects.create(name="Person 1")
-+ form = WriterForm(data={})
-+ queryset = form.fields['persons'].clean([str(person1.pk)] * 50)
-+ sql, params = queryset.query.sql_with_params()
-+ self.assertEqual(len(params), 1)
-+
- def test_file_field(self):
- # Test conditions when files is either not given or empty.
-
diff -Nru python-django-1.6.6/debian/patches/fix_test_encoding.patch python-django-1.7.4/debian/patches/fix_test_encoding.patch
--- python-django-1.6.6/debian/patches/fix_test_encoding.patch 2014-09-18 23:52:56.000000000 +0000
+++ python-django-1.7.4/debian/patches/fix_test_encoding.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Index: python-django-1.6.6/tests/utils_tests/test_jslex.py
-===================================================================
---- python-django-1.6.6.orig/tests/utils_tests/test_jslex.py 2014-09-18 18:52:45.204265409 -0500
-+++ python-django-1.6.6/tests/utils_tests/test_jslex.py 2014-09-18 18:52:54.712265771 -0500
-@@ -1,6 +1,6 @@
--"""Tests for jslex."""
--# encoding: utf-8
-+# -*- coding: utf-8 -*-
- # originally from https://bitbucket.org/ned/jslex
-+"""Tests for jslex."""
-
- from django.test import TestCase
- from django.utils.jslex import JsLexer, prepare_js_for_gettext
diff -Nru python-django-1.6.6/debian/patches/series python-django-1.7.4/debian/patches/series
--- python-django-1.6.6/debian/patches/series 2015-01-13 12:32:04.000000000 +0000
+++ python-django-1.7.4/debian/patches/series 2015-03-03 19:44:18.000000000 +0000
@@ -2,8 +2,3 @@
03_manpage.diff
06_use_debian_geoip_database_as_default.diff
99_fix_multipart_base64_decoding_large_files.patch
-fix_test_encoding.patch
-CVE-2015-0219.patch
-CVE-2015-0220.patch
-CVE-2015-0221.patch
-CVE-2015-0222.patch
diff -Nru python-django-1.6.6/debian/python-django-common.lintian-overrides python-django-1.7.4/debian/python-django-common.lintian-overrides
--- python-django-1.6.6/debian/python-django-common.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/debian/python-django-common.lintian-overrides 2015-02-09 09:39:56.000000000 +0000
@@ -0,0 +1,5 @@
+# Those gzip files are not created during build, the embedded timestamps
+# won't change across multiple rebuilds.
+python-django-common: package-contains-timestamped-gzip usr/share/python-django-common/django/contrib/gis/tests/distapp/fixtures/initial_data.json.gz
+python-django-common: package-contains-timestamped-gzip usr/share/python-django-common/django/contrib/gis/tests/geoapp/fixtures/initial_data.json.gz
+python-django-common: package-contains-timestamped-gzip usr/share/python-django-common/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz
diff -Nru python-django-1.6.6/debian/python-django-common.manpages python-django-1.7.4/debian/python-django-common.manpages
--- python-django-1.6.6/debian/python-django-common.manpages 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/debian/python-django-common.manpages 2015-02-09 09:39:56.000000000 +0000
@@ -0,0 +1 @@
+docs/man/django-admin.1
diff -Nru python-django-1.6.6/debian/python-django.manpages python-django-1.7.4/debian/python-django.manpages
--- python-django-1.6.6/debian/python-django.manpages 2014-08-21 02:29:40.000000000 +0000
+++ python-django-1.7.4/debian/python-django.manpages 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-docs/man/django-admin.1
diff -Nru python-django-1.6.6/debian/python-django.NEWS python-django-1.7.4/debian/python-django.NEWS
--- python-django-1.6.6/debian/python-django.NEWS 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/debian/python-django.NEWS 2015-02-09 09:39:56.000000000 +0000
@@ -0,0 +1,24 @@
+python-django (1.7-1) unstable; urgency=medium
+
+ Django 1.7 has a new feature to handle database schema upgrade called
+ "migrations" which is incompatible with South (provided by
+ python-django-south in Debian).
+
+ If you have Django applications using South, you will need to install Django
+ 1.6 to run pending migrations. This *must* be done first before running any
+ Django 1.7 migrations.
+
+ There is a script included with this package to automate the task of
+ installing Django 1.6 and south into a virtualenv and running the migrations.
+
+ apt-get install virtualenv
+ sh /usr/share/doc/python-django/examples/migrate-south --settings app.settings
+
+ Replace app.settings with the settings module your app uses.
+
+ Django 1.7 comes with many new features and some backwards incompatible
+ changes. They are well documented in the Django documentation:
+ https://docs.djangoproject.com/en/1.7/releases/1.7/
+ https://docs.djangoproject.com/en/1.7/internals/deprecation/#deprecation-removed-in-1-7
+
+ -- Raphaël Hertzog Mon, 08 Sep 2014 10:20:37 +0200
diff -Nru python-django-1.6.6/debian/rules python-django-1.7.4/debian/rules
--- python-django-1.6.6/debian/rules 2014-08-21 02:29:40.000000000 +0000
+++ python-django-1.7.4/debian/rules 2015-02-09 09:39:56.000000000 +0000
@@ -10,7 +10,7 @@
dh $@ --with sphinxdoc,python2,python3 --buildsystem=pybuild
override_dh_auto_clean:
- rm -rf docs.debian tests/__init__.py
+ rm -rf docs.debian
find -name "*.DS_Store" -delete
chmod a-x django/contrib/gis/tests/data/texas.dbf
dh_auto_clean
@@ -27,10 +27,10 @@
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- touch tests/__init__.py
mkdir -p tmp-locales
localedef -i /usr/share/i18n/locales/en_US -c -f UTF-8 -A /usr/share/locale/locale.alias tmp-locales/en_US.UTF-8
- LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=. tests/runtests.py --settings=tests.test_sqlite --verbosity=2
+ cd tests && LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=.. python ./runtests.py --verbosity=2
+ cd tests && LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=.. python3 ./runtests.py --verbosity=2
rm -rf tmp-locales
endif
@@ -38,17 +38,25 @@
# backup~ is used in tests
dh_clean -Xbackup~
-override_dh_install:
- dh_install
-
- # Fix permissions
- chmod 644 $(PREFIXC)/etc/bash_completion.d/django_bash_completion
- chmod 755 $(PREFIXC)/usr/bin/django-admin
-
- # Rename django-admin.py to django-admin
- rm $(PREFIX)/usr/bin/django-admin.py
- rm $(PREFIX3)/usr/bin/django-admin.py
-
+override_dh_auto_install:
+ dh_auto_install
+
+ # Drop extra license files
+ find $(PREFIX) -name LICENSE -o -name license.txt -o -name license.python.txt | \
+ xargs --no-run-if-empty rm
+ find $(PREFIX3) -name LICENSE -o -name license.txt -o -name license.python.txt | \
+ xargs --no-run-if-empty rm
+
+ # Drop django-admin{,.py} which is in python-django-common and
+ # clean up empty parent directories
+ rm $(PREFIX)/usr/bin/django-admin*
+ rm $(PREFIX3)/usr/bin/django-admin*
+ rmdir --ignore-fail-on-non-empty --parents $(PREFIX)/usr/bin $(PREFIX3)/usr/bin
+
+ # Fix the shebang lines to use python3 in python3-django
+ find $(PREFIX3) -name django-admin.py -or -name manage.py | \
+ xargs --no-run-if-empty sed -i -e '1s/python$$/python3/'
+
# Remove embedded Javascript libraries
set -e; for FILENAME in jquery.js jquery.min.js; do \
find $(PREFIX) -name $$FILENAME -exec \
@@ -57,6 +65,13 @@
ln -sf /usr/share/javascript/jquery/$$FILENAME {} \;; \
done
+override_dh_install:
+ dh_install
+
+ # Fix permissions
+ chmod 644 $(PREFIXC)/etc/bash_completion.d/django_bash_completion
+ chmod 755 $(PREFIXC)/usr/bin/django-admin
+
override_dh_python3:
dh_python3
find debian/python3-django/usr/lib/python3/dist-packages/ -type f -not -name '*.py' | \
diff -Nru python-django-1.6.6/django/apps/config.py python-django-1.7.4/django/apps/config.py
--- python-django-1.6.6/django/apps/config.py 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/django/apps/config.py 2015-01-27 17:12:29.000000000 +0000
@@ -0,0 +1,207 @@
+from importlib import import_module
+import os
+
+from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured
+from django.utils.module_loading import module_has_submodule
+from django.utils._os import upath
+
+
+MODELS_MODULE_NAME = 'models'
+
+
+class AppConfig(object):
+ """
+ Class representing a Django application and its configuration.
+ """
+
+ def __init__(self, app_name, app_module):
+ # Full Python path to the application eg. 'django.contrib.admin'.
+ self.name = app_name
+
+ # Root module for the application eg. .
+ self.module = app_module
+
+ # The following attributes could be defined at the class level in a
+ # subclass, hence the test-and-set pattern.
+
+ # Last component of the Python path to the application eg. 'admin'.
+ # This value must be unique across a Django project.
+ if not hasattr(self, 'label'):
+ self.label = app_name.rpartition(".")[2]
+
+ # Human-readable name for the application eg. "Admin".
+ if not hasattr(self, 'verbose_name'):
+ self.verbose_name = self.label.title()
+
+ # Filesystem path to the application directory eg.
+ # u'/usr/lib/python2.7/dist-packages/django/contrib/admin'. Unicode on
+ # Python 2 and a str on Python 3.
+ if not hasattr(self, 'path'):
+ self.path = self._path_from_module(app_module)
+
+ # Module containing models eg. . Set by import_models().
+ # None if the application doesn't have a models module.
+ self.models_module = None
+
+ # Mapping of lower case model names to model classes. Initially set to
+ # None to prevent accidental access before import_models() runs.
+ self.models = None
+
+ def __repr__(self):
+ return '<%s: %s>' % (self.__class__.__name__, self.label)
+
+ def _path_from_module(self, module):
+ """Attempt to determine app's filesystem path from its module."""
+ # See #21874 for extended discussion of the behavior of this method in
+ # various cases.
+ # Convert paths to list because Python 3.3 _NamespacePath does not
+ # support indexing.
+ paths = list(getattr(module, '__path__', []))
+ if len(paths) != 1:
+ filename = getattr(module, '__file__', None)
+ if filename is not None:
+ paths = [os.path.dirname(filename)]
+ if len(paths) > 1:
+ raise ImproperlyConfigured(
+ "The app module %r has multiple filesystem locations (%r); "
+ "you must configure this app with an AppConfig subclass "
+ "with a 'path' class attribute." % (module, paths))
+ elif not paths:
+ raise ImproperlyConfigured(
+ "The app module %r has no filesystem location, "
+ "you must configure this app with an AppConfig subclass "
+ "with a 'path' class attribute." % (module,))
+ return upath(paths[0])
+
+ @classmethod
+ def create(cls, entry):
+ """
+ Factory that creates an app config from an entry in INSTALLED_APPS.
+ """
+ try:
+ # If import_module succeeds, entry is a path to an app module,
+ # which may specify an app config class with default_app_config.
+ # Otherwise, entry is a path to an app config class or an error.
+ module = import_module(entry)
+
+ except ImportError:
+ # Track that importing as an app module failed. If importing as an
+ # app config class fails too, we'll trigger the ImportError again.
+ module = None
+
+ mod_path, _, cls_name = entry.rpartition('.')
+
+ # Raise the original exception when entry cannot be a path to an
+ # app config class.
+ if not mod_path:
+ raise
+
+ else:
+ try:
+ # If this works, the app module specifies an app config class.
+ entry = module.default_app_config
+ except AttributeError:
+ # Otherwise, it simply uses the default app config class.
+ return cls(entry, module)
+ else:
+ mod_path, _, cls_name = entry.rpartition('.')
+
+ # If we're reaching this point, we must attempt to load the app config
+ # class located at .
+
+ # Avoid django.utils.module_loading.import_by_path because it
+ # masks errors -- it reraises ImportError as ImproperlyConfigured.
+ mod = import_module(mod_path)
+ try:
+ cls = getattr(mod, cls_name)
+ except AttributeError:
+ if module is None:
+ # If importing as an app module failed, that error probably
+ # contains the most informative traceback. Trigger it again.
+ import_module(entry)
+ else:
+ raise
+
+ # Check for obvious errors. (This check prevents duck typing, but
+ # it could be removed if it became a problem in practice.)
+ if not issubclass(cls, AppConfig):
+ raise ImproperlyConfigured(
+ "'%s' isn't a subclass of AppConfig." % entry)
+
+ # Obtain app name here rather than in AppClass.__init__ to keep
+ # all error checking for entries in INSTALLED_APPS in one place.
+ try:
+ app_name = cls.name
+ except AttributeError:
+ raise ImproperlyConfigured(
+ "'%s' must supply a name attribute." % entry)
+
+ # Ensure app_name points to a valid module.
+ app_module = import_module(app_name)
+
+ # Entry is a path to an app config class.
+ return cls(app_name, app_module)
+
+ def check_models_ready(self):
+ """
+ Raises an exception if models haven't been imported yet.
+ """
+ if self.models is None:
+ raise AppRegistryNotReady(
+ "Models for app '%s' haven't been imported yet." % self.label)
+
+ def get_model(self, model_name):
+ """
+ Returns the model with the given case-insensitive model_name.
+
+ Raises LookupError if no model exists with this name.
+ """
+ self.check_models_ready()
+ try:
+ return self.models[model_name.lower()]
+ except KeyError:
+ raise LookupError(
+ "App '%s' doesn't have a '%s' model." % (self.label, model_name))
+
+ def get_models(self, include_auto_created=False,
+ include_deferred=False, include_swapped=False):
+ """
+ Returns an iterable of models.
+
+ By default, the following models aren't included:
+
+ - auto-created models for many-to-many relations without
+ an explicit intermediate table,
+ - models created to satisfy deferred attribute queries,
+ - models that have been swapped out.
+
+ Set the corresponding keyword argument to True to include such models.
+ Keyword arguments aren't documented; they're a private API.
+ """
+ self.check_models_ready()
+ for model in self.models.values():
+ if model._deferred and not include_deferred:
+ continue
+ if model._meta.auto_created and not include_auto_created:
+ continue
+ if model._meta.swapped and not include_swapped:
+ continue
+ yield model
+
+ def import_models(self, all_models):
+ # Dictionary of models for this app, primarily maintained in the
+ # 'all_models' attribute of the Apps this AppConfig is attached to.
+ # Injected as a parameter because it gets populated when models are
+ # imported, which might happen before populate() imports models.
+ self.models = all_models
+
+ if module_has_submodule(self.module, MODELS_MODULE_NAME):
+ models_module_name = '%s.%s' % (self.name, MODELS_MODULE_NAME)
+ self.models_module = import_module(models_module_name)
+
+ def ready(self):
+ """
+ Override this method in subclasses to run code when Django starts.
+ """
diff -Nru python-django-1.6.6/django/apps/__init__.py python-django-1.7.4/django/apps/__init__.py
--- python-django-1.6.6/django/apps/__init__.py 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/django/apps/__init__.py 2015-01-27 17:12:29.000000000 +0000
@@ -0,0 +1,2 @@
+from .config import AppConfig # NOQA
+from .registry import apps # NOQA
diff -Nru python-django-1.6.6/django/apps/registry.py python-django-1.7.4/django/apps/registry.py
--- python-django-1.6.6/django/apps/registry.py 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/django/apps/registry.py 2015-01-27 17:12:29.000000000 +0000
@@ -0,0 +1,441 @@
+from collections import Counter, defaultdict, OrderedDict
+import os
+import sys
+import threading
+import warnings
+
+from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured
+from django.utils import lru_cache
+from django.utils.deprecation import RemovedInDjango19Warning
+from django.utils._os import upath
+
+from .config import AppConfig
+
+
+class Apps(object):
+ """
+ A registry that stores the configuration of installed applications.
+
+ It also keeps track of models eg. to provide reverse-relations.
+ """
+
+ def __init__(self, installed_apps=()):
+ # installed_apps is set to None when creating the master registry
+ # because it cannot be populated at that point. Other registries must
+ # provide a list of installed apps and are populated immediately.
+ if installed_apps is None and hasattr(sys.modules[__name__], 'apps'):
+ raise RuntimeError("You must supply an installed_apps argument.")
+
+ # Mapping of app labels => model names => model classes. Every time a
+ # model is imported, ModelBase.__new__ calls apps.register_model which
+ # creates an entry in all_models. All imported models are registered,
+ # regardless of whether they're defined in an installed application
+ # and whether the registry has been populated. Since it isn't possible
+ # to reimport a module safely (it could reexecute initialization code)
+ # all_models is never overridden or reset.
+ self.all_models = defaultdict(OrderedDict)
+
+ # Mapping of labels to AppConfig instances for installed apps.
+ self.app_configs = OrderedDict()
+
+ # Stack of app_configs. Used to store the current state in
+ # set_available_apps and set_installed_apps.
+ self.stored_app_configs = []
+
+ # Whether the registry is populated.
+ self.apps_ready = self.models_ready = self.ready = False
+
+ # Lock for thread-safe population.
+ self._lock = threading.Lock()
+
+ # Pending lookups for lazy relations.
+ self._pending_lookups = {}
+
+ # Populate apps and models, unless it's the master registry.
+ if installed_apps is not None:
+ self.populate(installed_apps)
+
+ def populate(self, installed_apps=None):
+ """
+ Loads application configurations and models.
+
+ This method imports each application module and then each model module.
+
+ It is thread safe and idempotent, but not reentrant.
+ """
+ if self.ready:
+ return
+
+ # populate() might be called by two threads in parallel on servers
+ # that create threads before initializing the WSGI callable.
+ with self._lock:
+ if self.ready:
+ return
+
+ # app_config should be pristine, otherwise the code below won't
+ # guarantee that the order matches the order in INSTALLED_APPS.
+ if self.app_configs:
+ raise RuntimeError("populate() isn't reentrant")
+
+ # Load app configs and app modules.
+ for entry in installed_apps:
+ if isinstance(entry, AppConfig):
+ app_config = entry
+ else:
+ app_config = AppConfig.create(entry)
+ if app_config.label in self.app_configs:
+ raise ImproperlyConfigured(
+ "Application labels aren't unique, "
+ "duplicates: %s" % app_config.label)
+
+ self.app_configs[app_config.label] = app_config
+
+ # Check for duplicate app names.
+ counts = Counter(
+ app_config.name for app_config in self.app_configs.values())
+ duplicates = [
+ name for name, count in counts.most_common() if count > 1]
+ if duplicates:
+ raise ImproperlyConfigured(
+ "Application names aren't unique, "
+ "duplicates: %s" % ", ".join(duplicates))
+
+ self.apps_ready = True
+
+ # Load models.
+ for app_config in self.app_configs.values():
+ all_models = self.all_models[app_config.label]
+ app_config.import_models(all_models)
+
+ self.clear_cache()
+
+ self.models_ready = True
+
+ for app_config in self.get_app_configs():
+ app_config.ready()
+
+ self.ready = True
+
+ def check_apps_ready(self):
+ """
+ Raises an exception if all apps haven't been imported yet.
+ """
+ if not self.apps_ready:
+ raise AppRegistryNotReady("Apps aren't loaded yet.")
+
+ def check_models_ready(self):
+ """
+ Raises an exception if all models haven't been imported yet.
+ """
+ if not self.models_ready:
+ raise AppRegistryNotReady("Models aren't loaded yet.")
+
+ def get_app_configs(self):
+ """
+ Imports applications and returns an iterable of app configs.
+ """
+ self.check_apps_ready()
+ return self.app_configs.values()
+
+ def get_app_config(self, app_label):
+ """
+ Imports applications and returns an app config for the given label.
+
+ Raises LookupError if no application exists with this label.
+ """
+ self.check_apps_ready()
+ try:
+ return self.app_configs[app_label]
+ except KeyError:
+ raise LookupError("No installed app with label '%s'." % app_label)
+
+ # This method is performance-critical at least for Django's test suite.
+ @lru_cache.lru_cache(maxsize=None)
+ def get_models(self, app_mod=None, include_auto_created=False,
+ include_deferred=False, include_swapped=False):
+ """
+ Returns a list of all installed models.
+
+ By default, the following models aren't included:
+
+ - auto-created models for many-to-many relations without
+ an explicit intermediate table,
+ - models created to satisfy deferred attribute queries,
+ - models that have been swapped out.
+
+ Set the corresponding keyword argument to True to include such models.
+ """
+ self.check_models_ready()
+ if app_mod:
+ warnings.warn(
+ "The app_mod argument of get_models is deprecated.",
+ RemovedInDjango19Warning, stacklevel=2)
+ app_label = app_mod.__name__.split('.')[-2]
+ try:
+ return list(self.get_app_config(app_label).get_models(
+ include_auto_created, include_deferred, include_swapped))
+ except LookupError:
+ return []
+
+ result = []
+ for app_config in self.app_configs.values():
+ result.extend(list(app_config.get_models(
+ include_auto_created, include_deferred, include_swapped)))
+ return result
+
+ def get_model(self, app_label, model_name=None):
+ """
+ Returns the model matching the given app_label and model_name.
+
+ As a shortcut, this function also accepts a single argument in the
+ form ..
+
+ model_name is case-insensitive.
+
+ Raises LookupError if no application exists with this label, or no
+ model exists with this name in the application. Raises ValueError if
+ called with a single argument that doesn't contain exactly one dot.
+ """
+ self.check_models_ready()
+ if model_name is None:
+ app_label, model_name = app_label.split('.')
+ return self.get_app_config(app_label).get_model(model_name.lower())
+
+ def register_model(self, app_label, model):
+ # Since this method is called when models are imported, it cannot
+ # perform imports because of the risk of import loops. It mustn't
+ # call get_app_config().
+ model_name = model._meta.model_name
+ app_models = self.all_models[app_label]
+ if model_name in app_models:
+ if (model.__name__ == app_models[model_name].__name__ and
+ model.__module__ == app_models[model_name].__module__):
+ warnings.warn(
+ "Model '%s.%s' was already registered. "
+ "Reloading models is not advised as it can lead to inconsistencies, "
+ "most notably with related models." % (model_name, app_label),
+ RuntimeWarning, stacklevel=2)
+ else:
+ raise RuntimeError(
+ "Conflicting '%s' models in application '%s': %s and %s." %
+ (model_name, app_label, app_models[model_name], model))
+ app_models[model_name] = model
+ self.clear_cache()
+
+ def is_installed(self, app_name):
+ """
+ Checks whether an application with this name exists in the registry.
+
+ app_name is the full name of the app eg. 'django.contrib.admin'.
+ """
+ self.check_apps_ready()
+ return any(ac.name == app_name for ac in self.app_configs.values())
+
+ def get_containing_app_config(self, object_name):
+ """
+ Look for an app config containing a given object.
+
+ object_name is the dotted Python path to the object.
+
+ Returns the app config for the inner application in case of nesting.
+ Returns None if the object isn't in any registered app config.
+ """
+ # In Django 1.7 and 1.8, it's allowed to call this method at import
+ # time, even while the registry is being populated. In Django 1.9 and
+ # later, that should be forbidden with `self.check_apps_ready()`.
+ candidates = []
+ for app_config in self.app_configs.values():
+ if object_name.startswith(app_config.name):
+ subpath = object_name[len(app_config.name):]
+ if subpath == '' or subpath[0] == '.':
+ candidates.append(app_config)
+ if candidates:
+ return sorted(candidates, key=lambda ac: -len(ac.name))[0]
+
+ def get_registered_model(self, app_label, model_name):
+ """
+ Similar to get_model(), but doesn't require that an app exists with
+ the given app_label.
+
+ It's safe to call this method at import time, even while the registry
+ is being populated.
+ """
+ model = self.all_models[app_label].get(model_name.lower())
+ if model is None:
+ raise LookupError(
+ "Model '%s.%s' not registered." % (app_label, model_name))
+ return model
+
+ def set_available_apps(self, available):
+ """
+ Restricts the set of installed apps used by get_app_config[s].
+
+ available must be an iterable of application names.
+
+ set_available_apps() must be balanced with unset_available_apps().
+
+ Primarily used for performance optimization in TransactionTestCase.
+
+ This method is safe is the sense that it doesn't trigger any imports.
+ """
+ available = set(available)
+ installed = set(app_config.name for app_config in self.get_app_configs())
+ if not available.issubset(installed):
+ raise ValueError("Available apps isn't a subset of installed "
+ "apps, extra apps: %s" % ", ".join(available - installed))
+
+ self.stored_app_configs.append(self.app_configs)
+ self.app_configs = OrderedDict(
+ (label, app_config)
+ for label, app_config in self.app_configs.items()
+ if app_config.name in available)
+ self.clear_cache()
+
+ def unset_available_apps(self):
+ """
+ Cancels a previous call to set_available_apps().
+ """
+ self.app_configs = self.stored_app_configs.pop()
+ self.clear_cache()
+
+ def set_installed_apps(self, installed):
+ """
+ Enables a different set of installed apps for get_app_config[s].
+
+ installed must be an iterable in the same format as INSTALLED_APPS.
+
+ set_installed_apps() must be balanced with unset_installed_apps(),
+ even if it exits with an exception.
+
+ Primarily used as a receiver of the setting_changed signal in tests.
+
+ This method may trigger new imports, which may add new models to the
+ registry of all imported models. They will stay in the registry even
+ after unset_installed_apps(). Since it isn't possible to replay
+ imports safely (eg. that could lead to registering listeners twice),
+ models are registered when they're imported and never removed.
+ """
+ if not self.ready:
+ raise AppRegistryNotReady("App registry isn't ready yet.")
+ self.stored_app_configs.append(self.app_configs)
+ self.app_configs = OrderedDict()
+ self.apps_ready = self.models_ready = self.ready = False
+ self.clear_cache()
+ self.populate(installed)
+
+ def unset_installed_apps(self):
+ """
+ Cancels a previous call to set_installed_apps().
+ """
+ self.app_configs = self.stored_app_configs.pop()
+ self.apps_ready = self.models_ready = self.ready = True
+ self.clear_cache()
+
+ def clear_cache(self):
+ """
+ Clears all internal caches, for methods that alter the app registry.
+
+ This is mostly used in tests.
+ """
+ self.get_models.cache_clear()
+
+ ### DEPRECATED METHODS GO BELOW THIS LINE ###
+
+ def load_app(self, app_name):
+ """
+ Loads the app with the provided fully qualified name, and returns the
+ model module.
+ """
+ warnings.warn(
+ "load_app(app_name) is deprecated.",
+ RemovedInDjango19Warning, stacklevel=2)
+ app_config = AppConfig.create(app_name)
+ app_config.import_models(self.all_models[app_config.label])
+ self.app_configs[app_config.label] = app_config
+ self.clear_cache()
+ return app_config.models_module
+
+ def app_cache_ready(self):
+ warnings.warn(
+ "app_cache_ready() is deprecated in favor of the ready property.",
+ RemovedInDjango19Warning, stacklevel=2)
+ return self.ready
+
+ def get_app(self, app_label):
+ """
+ Returns the module containing the models for the given app_label.
+ """
+ warnings.warn(
+ "get_app_config(app_label).models_module supersedes get_app(app_label).",
+ RemovedInDjango19Warning, stacklevel=2)
+ try:
+ models_module = self.get_app_config(app_label).models_module
+ except LookupError as exc:
+ # Change the exception type for backwards compatibility.
+ raise ImproperlyConfigured(*exc.args)
+ if models_module is None:
+ raise ImproperlyConfigured(
+ "App '%s' doesn't have a models module." % app_label)
+ return models_module
+
+ def get_apps(self):
+ """
+ Returns a list of all installed modules that contain models.
+ """
+ warnings.warn(
+ "[a.models_module for a in get_app_configs()] supersedes get_apps().",
+ RemovedInDjango19Warning, stacklevel=2)
+ app_configs = self.get_app_configs()
+ return [app_config.models_module for app_config in app_configs
+ if app_config.models_module is not None]
+
+ def _get_app_package(self, app):
+ return '.'.join(app.__name__.split('.')[:-1])
+
+ def get_app_package(self, app_label):
+ warnings.warn(
+ "get_app_config(label).name supersedes get_app_package(label).",
+ RemovedInDjango19Warning, stacklevel=2)
+ return self._get_app_package(self.get_app(app_label))
+
+ def _get_app_path(self, app):
+ if hasattr(app, '__path__'): # models/__init__.py package
+ app_path = app.__path__[0]
+ else: # models.py module
+ app_path = app.__file__
+ return os.path.dirname(upath(app_path))
+
+ def get_app_path(self, app_label):
+ warnings.warn(
+ "get_app_config(label).path supersedes get_app_path(label).",
+ RemovedInDjango19Warning, stacklevel=2)
+ return self._get_app_path(self.get_app(app_label))
+
+ def get_app_paths(self):
+ """
+ Returns a list of paths to all installed apps.
+
+ Useful for discovering files at conventional locations inside apps
+ (static files, templates, etc.)
+ """
+ warnings.warn(
+ "[a.path for a in get_app_configs()] supersedes get_app_paths().",
+ RemovedInDjango19Warning, stacklevel=2)
+ self.check_apps_ready()
+ app_paths = []
+ for app in self.get_apps():
+ app_paths.append(self._get_app_path(app))
+ return app_paths
+
+ def register_models(self, app_label, *models):
+ """
+ Register a set of models as belonging to an app.
+ """
+ warnings.warn(
+ "register_models(app_label, *models) is deprecated.",
+ RemovedInDjango19Warning, stacklevel=2)
+ for model in models:
+ self.register_model(app_label, model)
+
+
+apps = Apps(installed_apps=None)
diff -Nru python-django-1.6.6/django/bin/daily_cleanup.py python-django-1.7.4/django/bin/daily_cleanup.py
--- python-django-1.6.6/django/bin/daily_cleanup.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/bin/daily_cleanup.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Daily cleanup job.
-
-Can be run as a cronjob to clean out old data from the database (only expired
-sessions at the moment).
-"""
-
-import warnings
-
-from django.core import management
-
-if __name__ == "__main__":
- warnings.warn(
- "The `daily_cleanup` script has been deprecated "
- "in favor of `django-admin.py clearsessions`.",
- DeprecationWarning)
- management.call_command('clearsessions')
diff -Nru python-django-1.6.6/django/bin/django-2to3.py python-django-1.7.4/django/bin/django-2to3.py
--- python-django-1.6.6/django/bin/django-2to3.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/bin/django-2to3.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-# This works exactly like 2to3, except that it uses Django's fixers rather
-# than 2to3's built-in fixers.
-
-import sys
-from lib2to3.main import main
-
-sys.exit(main("django.utils.2to3_fixes"))
-
diff -Nru python-django-1.6.6/django/bin/profiling/gather_profile_stats.py python-django-1.7.4/django/bin/profiling/gather_profile_stats.py
--- python-django-1.6.6/django/bin/profiling/gather_profile_stats.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/bin/profiling/gather_profile_stats.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-
-"""
-gather_profile_stats.py /path/to/dir/of/profiles
-
-Note that the aggregated profiles must be read with pstats.Stats, not
-hotshot.stats (the formats are incompatible)
-"""
-
-from hotshot import stats
-import os
-import pstats
-import sys
-
-def gather_stats(p):
- profiles = {}
- for f in os.listdir(p):
- if f.endswith('.agg.prof'):
- path = f[:-9]
- prof = pstats.Stats(os.path.join(p, f))
- elif f.endswith('.prof'):
- bits = f.split('.')
- path = ".".join(bits[:-3])
- prof = stats.load(os.path.join(p, f))
- else:
- continue
- print("Processing %s" % f)
- if path in profiles:
- profiles[path].add(prof)
- else:
- profiles[path] = prof
- os.unlink(os.path.join(p, f))
- for (path, prof) in profiles.items():
- prof.dump_stats(os.path.join(p, "%s.agg.prof" % path))
-
-if __name__ == '__main__':
- gather_stats(sys.argv[1])
diff -Nru python-django-1.6.6/django/bin/unique-messages.py python-django-1.7.4/django/bin/unique-messages.py
--- python-django-1.6.6/django/bin/unique-messages.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/bin/unique-messages.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-def unique_messages():
- basedir = None
-
- if os.path.isdir(os.path.join('conf', 'locale')):
- basedir = os.path.abspath(os.path.join('conf', 'locale'))
- elif os.path.isdir('locale'):
- basedir = os.path.abspath('locale')
- else:
- print("This script should be run from the Django Git tree or your project or app tree.")
- sys.exit(1)
-
- for (dirpath, dirnames, filenames) in os.walk(basedir):
- for f in filenames:
- if f.endswith('.po'):
- sys.stderr.write('processing file %s in %s\n' % (f, dirpath))
- pf = os.path.splitext(os.path.join(dirpath, f))[0]
- cmd = 'msguniq "%s.po"' % pf
- stdout = os.popen(cmd)
- msg = stdout.read()
- with open('%s.po' % pf, 'w') as fp:
- fp.write(msg)
-
-if __name__ == "__main__":
- unique_messages()
diff -Nru python-django-1.6.6/django/conf/global_settings.py python-django-1.7.4/django/conf/global_settings.py
--- python-django-1.6.6/django/conf/global_settings.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/global_settings.py 2015-01-27 17:12:29.000000000 +0000
@@ -50,6 +50,7 @@
LANGUAGES = (
('af', gettext_noop('Afrikaans')),
('ar', gettext_noop('Arabic')),
+ ('ast', gettext_noop('Asturian')),
('az', gettext_noop('Azerbaijani')),
('bg', gettext_noop('Bulgarian')),
('be', gettext_noop('Belarusian')),
@@ -63,6 +64,7 @@
('de', gettext_noop('German')),
('el', gettext_noop('Greek')),
('en', gettext_noop('English')),
+ ('en-au', gettext_noop('Australian English')),
('en-gb', gettext_noop('British English')),
('eo', gettext_noop('Esperanto')),
('es', gettext_noop('Spanish')),
@@ -75,7 +77,7 @@
('fa', gettext_noop('Persian')),
('fi', gettext_noop('Finnish')),
('fr', gettext_noop('French')),
- ('fy-nl', gettext_noop('Frisian')),
+ ('fy', gettext_noop('Frisian')),
('ga', gettext_noop('Irish')),
('gl', gettext_noop('Galician')),
('he', gettext_noop('Hebrew')),
@@ -84,6 +86,7 @@
('hu', gettext_noop('Hungarian')),
('ia', gettext_noop('Interlingua')),
('id', gettext_noop('Indonesian')),
+ ('io', gettext_noop('Ido')),
('is', gettext_noop('Icelandic')),
('it', gettext_noop('Italian')),
('ja', gettext_noop('Japanese')),
@@ -98,6 +101,7 @@
('mk', gettext_noop('Macedonian')),
('ml', gettext_noop('Malayalam')),
('mn', gettext_noop('Mongolian')),
+ ('mr', gettext_noop('Marathi')),
('my', gettext_noop('Burmese')),
('nb', gettext_noop('Norwegian Bokmal')),
('ne', gettext_noop('Nepali')),
@@ -127,6 +131,8 @@
('ur', gettext_noop('Urdu')),
('vi', gettext_noop('Vietnamese')),
('zh-cn', gettext_noop('Simplified Chinese')),
+ ('zh-hans', gettext_noop('Simplified Chinese')),
+ ('zh-hant', gettext_noop('Traditional Chinese')),
('zh-tw', gettext_noop('Traditional Chinese')),
)
@@ -137,7 +143,13 @@
# to load the internationalization machinery.
USE_I18N = True
LOCALE_PATHS = ()
+
+# Settings for language cookie
LANGUAGE_COOKIE_NAME = 'django_language'
+LANGUAGE_COOKIE_AGE = None
+LANGUAGE_COOKIE_DOMAIN = None
+LANGUAGE_COOKIE_PATH = '/'
+
# If you set this to True, Django will format dates, numbers and calendars
# according to user current locale.
@@ -184,6 +196,7 @@
EMAIL_HOST_USER = ''
EMAIL_HOST_PASSWORD = ''
EMAIL_USE_TLS = False
+EMAIL_USE_SSL = False
# List of strings representing installed apps.
INSTALLED_APPS = ()
@@ -197,7 +210,7 @@
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
-# 'django.template.loaders.eggs.Loader',
+ # 'django.template.loaders.eggs.Loader',
)
# List of processors used by RequestContext to populate the context.
@@ -210,7 +223,7 @@
'django.core.context_processors.media',
'django.core.context_processors.static',
'django.core.context_processors.tz',
-# 'django.core.context_processors.request',
+ # 'django.core.context_processors.request',
'django.contrib.messages.context_processors.messages',
)
@@ -252,7 +265,7 @@
# Example: ('/home/html', '/var/www')
ALLOWED_INCLUDE_ROOTS = ()
-# If this is a admin settings module, this should be a list of
+# If this is an admin settings module, this should be a list of
# settings modules (in the format 'foo.bar.baz') for which this admin
# is an admin.
ADMIN_FOR = ()
@@ -301,7 +314,7 @@
# Maximum size, in bytes, of a request before it will be streamed to the
# file system instead of into memory.
-FILE_UPLOAD_MAX_MEMORY_SIZE = 2621440 # i.e. 2.5 MB
+FILE_UPLOAD_MAX_MEMORY_SIZE = 2621440 # i.e. 2.5 MB
# Directory in which upload streamed files will be temporarily saved. A value of
# `None` will make Django use the operating system's default temporary directory
@@ -312,6 +325,11 @@
# you'd pass directly to os.chmod; see http://docs.python.org/lib/os-file-dir.html.
FILE_UPLOAD_PERMISSIONS = None
+# The numeric mode to assign to newly-created directories, when uploading files.
+# The value should be a mode as you'd pass to os.chmod;
+# see http://docs.python.org/lib/os-file-dir.html.
+FILE_UPLOAD_DIRECTORY_PERMISSIONS = None
+
# Python module path where user will place custom format definition.
# The directory where this setting is pointing should contain subdirectories
# named as the locales, containing a formats.py file
@@ -354,11 +372,11 @@
# http://docs.python.org/library/datetime.html#strftime-behavior
# * Note that these format strings are different from the ones to display dates
DATE_INPUT_FORMATS = (
- '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
- '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
- '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
- '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
- '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
+ '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
+ '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
+ '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
+ '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
+ '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
)
# Default formats to be used when parsing times from input boxes, in order
@@ -446,12 +464,7 @@
# response phase the middleware will be applied in reverse order.
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
-# 'django.middleware.http.ConditionalGetMiddleware',
-# 'django.middleware.gzip.GZipMiddleware',
)
############
@@ -543,6 +556,7 @@
# Settings for CSRF cookie.
CSRF_COOKIE_NAME = 'csrftoken'
+CSRF_COOKIE_AGE = 60 * 60 * 24 * 7 * 52
CSRF_COOKIE_DOMAIN = None
CSRF_COOKIE_PATH = '/'
CSRF_COOKIE_SECURE = False
@@ -563,7 +577,7 @@
###########
# The callable to use to configure logging
-LOGGING_CONFIG = 'django.utils.log.dictConfig'
+LOGGING_CONFIG = 'logging.config.dictConfig'
# Custom logging configuration.
LOGGING = {}
@@ -579,6 +593,10 @@
# The name of the class to use to run the test suite
TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+# Apps that don't need to be serialized at test database creation time
+# (only apps with migrations are to start with)
+TEST_NON_SERIALIZED_APPS = []
+
############
# FIXTURES #
############
@@ -601,5 +619,22 @@
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
+ # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
)
+
+##############
+# MIGRATIONS #
+##############
+
+# Migration module overrides for apps, by app label.
+MIGRATION_MODULES = {}
+
+#################
+# SYSTEM CHECKS #
+#################
+
+# List of all issues generated by system checks that should be silenced. Light
+# issues like warnings, infos or debugs will not generate a message. Silencing
+# serious issues like errors and criticals does not result in hiding the
+# message, but Django will not stop you from e.g. running server.
+SILENCED_SYSTEM_CHECKS = []
diff -Nru python-django-1.6.6/django/conf/__init__.py python-django-1.7.4/django/conf/__init__.py
--- python-django-1.6.6/django/conf/__init__.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/__init__.py 2015-01-27 17:12:29.000000000 +0000
@@ -6,17 +6,13 @@
a list of all possible variables.
"""
-import logging
+import importlib
import os
-import sys
import time # Needed for Windows
-import warnings
from django.conf import global_settings
from django.core.exceptions import ImproperlyConfigured
from django.utils.functional import LazyObject, empty
-from django.utils import importlib
-from django.utils.module_loading import import_by_path
from django.utils import six
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -34,11 +30,8 @@
is used the first time we need any settings at all, if the user has not
previously configured the settings manually.
"""
- try:
- settings_module = os.environ[ENVIRONMENT_VARIABLE]
- if not settings_module: # If it's set but is an empty string.
- raise KeyError
- except KeyError:
+ settings_module = os.environ.get(ENVIRONMENT_VARIABLE)
+ if not settings_module:
desc = ("setting %s" % name) if name else "settings"
raise ImproperlyConfigured(
"Requested %s, but settings are not configured. "
@@ -47,38 +40,12 @@
% (desc, ENVIRONMENT_VARIABLE))
self._wrapped = Settings(settings_module)
- self._configure_logging()
def __getattr__(self, name):
if self._wrapped is empty:
self._setup(name)
return getattr(self._wrapped, name)
- def _configure_logging(self):
- """
- Setup logging from LOGGING_CONFIG and LOGGING settings.
- """
- if not sys.warnoptions:
- try:
- # Route warnings through python logging
- logging.captureWarnings(True)
- # Allow DeprecationWarnings through the warnings filters
- warnings.simplefilter("default", DeprecationWarning)
- except AttributeError:
- # No captureWarnings on Python 2.6, DeprecationWarnings are on anyway
- pass
-
- if self.LOGGING_CONFIG:
- from django.utils.log import DEFAULT_LOGGING
- # First find the logging configuration function ...
- logging_config_func = import_by_path(self.LOGGING_CONFIG)
-
- logging_config_func(DEFAULT_LOGGING)
-
- # ... then invoke it with the logging settings
- if self.LOGGING:
- logging_config_func(self.LOGGING)
-
def configure(self, default_settings=global_settings, **options):
"""
Called to manually configure the settings. The 'default_settings'
@@ -91,7 +58,6 @@
for name, value in options.items():
setattr(holder, name, value)
self._wrapped = holder
- self._configure_logging()
@property
def configured(self):
@@ -118,7 +84,7 @@
def __init__(self, settings_module):
# update this dict from global settings (but only for ALL_CAPS settings)
for setting in dir(global_settings):
- if setting == setting.upper():
+ if setting.isupper():
setattr(self, setting, getattr(global_settings, setting))
# store the settings module in case someone later cares
@@ -132,20 +98,18 @@
% (self.SETTINGS_MODULE, e)
)
- # Settings that should be converted into tuples if they're mistakenly entered
- # as strings.
tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS")
-
+ self._explicit_settings = set()
for setting in dir(mod):
- if setting == setting.upper():
+ if setting.isupper():
setting_value = getattr(mod, setting)
- if setting in tuple_settings and \
- isinstance(setting_value, six.string_types):
- warnings.warn("The %s setting must be a tuple. Please fix your "
- "settings, as auto-correction is now deprecated." % setting,
- DeprecationWarning, stacklevel=2)
- setting_value = (setting_value,) # In case the user forgot the comma.
+
+ if (setting in tuple_settings and
+ isinstance(setting_value, six.string_types)):
+ raise ImproperlyConfigured("The %s setting must be a tuple. "
+ "Please fix your settings." % setting)
setattr(self, setting, setting_value)
+ self._explicit_settings.add(setting)
if not self.SECRET_KEY:
raise ImproperlyConfigured("The SECRET_KEY setting must not be empty.")
@@ -162,6 +126,9 @@
os.environ['TZ'] = self.TIME_ZONE
time.tzset()
+ def is_overridden(self, setting):
+ return setting in self._explicit_settings
+
class UserSettingsHolder(BaseSettings):
"""
@@ -186,13 +153,20 @@
def __setattr__(self, name, value):
self._deleted.discard(name)
- return super(UserSettingsHolder, self).__setattr__(name, value)
+ super(UserSettingsHolder, self).__setattr__(name, value)
def __delattr__(self, name):
self._deleted.add(name)
- return super(UserSettingsHolder, self).__delattr__(name)
+ if hasattr(self, name):
+ super(UserSettingsHolder, self).__delattr__(name)
def __dir__(self):
return list(self.__dict__) + dir(self.default_settings)
+ def is_overridden(self, setting):
+ deleted = (setting in self._deleted)
+ set_locally = (setting in self.__dict__)
+ set_on_default = getattr(self.default_settings, 'is_overridden', lambda s: False)(setting)
+ return (deleted or set_locally or set_on_default)
+
settings = LazySettings()
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/af/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/af/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/af/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/af/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/af/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/af/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,12 +2,13 @@
#
# Translators:
# Stephen Cox , 2011-2012
+# unklphil , 2014
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/django/"
"language/af/)\n"
@@ -26,6 +27,10 @@
msgstr "Arabies"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Aserbeidjans"
@@ -78,323 +83,351 @@
msgstr "Engels"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "Australiese Engels"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Britse Engels"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Spaans"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Argentynse Spaans"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Meksikaanse Spaans"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Nicaraguaanse Spaans"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Venezolaanse Spaans"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estnies"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Baskies"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persies"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Fins"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Fraans"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Fries"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Iers"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galicies"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebreeus"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindoe"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Kroaties"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Hongaars"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonesies"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Yslands"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Italiaans"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japannees"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Georgian"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazakh"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Koreaanse"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Luxemburgs"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Litaus"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Lets"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Macedonies"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malabaars"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongools"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr "Birmaans"
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Noors Bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepalees"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Nederlands"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Noorweegse Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
-msgstr ""
+msgstr "Osseties"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Pools"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugees"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Brasiliaanse Portugees"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Roemeens"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Russiese"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slowaakse"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Sloveens"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albanees"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serwies"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serwies Latyns"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Sweeds"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Teloegoe"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turkish"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tataars"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Oedmoerts"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Oekraïens"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Viëtnamees"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Vereenvoudigde Sjinees"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Tradisionele Chinese"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Sindikasie"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Webontwerp"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Sleutel 'n geldige waarde in."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Sleutel 'n geldige URL in."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr ""
+msgstr "Sleutel 'n geldige heelgetal in."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Sleutel 'n geldige e-pos adres in."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Sleutel 'n geldige \"slak\" wat bestaan uit letters, syfers, beklemtoon of "
"koppel."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Sleutel 'n geldige IPv4-adres in."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Voer 'n geldige IPv6-adres in."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Voer 'n geldige IPv4 of IPv6-adres in."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Sleutel slegs syfers in wat deur kommas geskei is."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Maak seker dat hierdie waarde %(limit_value)s is (dit is %(show_value)s )."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Maak seker dat hierdie waarde minder as of gelyk aan %(limit_value)s is."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Maak seker dat hierdie waarde groter as of gelyk aan %(limit_value)s is."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -403,9 +436,13 @@
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Maak seker hierdie waarde het ten minste %(limit_value)d karakter (dit het "
+"%(show_value)d)."
msgstr[1] ""
+"Maak seker hierdie waarde het ten minste %(limit_value)d karakters (dit het "
+"%(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -414,295 +451,326 @@
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Maak seker hierdie waarde het op die meeste %(limit_value)d karakter (dit "
+"het %(show_value)d)."
msgstr[1] ""
+"Maak seker hierdie waarde het op die meeste %(limit_value)d karakters (dit "
+"het %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s moet uniek wees vir %(date_field)s %(lookup)s ."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "en"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s met hierdie %(field_label)s bestaan alreeds."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s met hierdie %(field_labels)s bestaan alreeds."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
-msgstr ""
+msgstr "Waarde %(value)r is nie 'n geldige keuse nie."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Hierdie veld kan nie nil wees nie."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Hierdie veld kan nie leeg wees nie."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s met hierdie %(field_label)s bestaan alreeds."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s moet uniek wees vir %(date_field_label)s %(lookup_type)s."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Veld van type: %(field_type)s "
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Heelgetal"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr ""
+msgstr "'%(value)s' waarde moet 'n heelgetal wees."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr ""
+msgstr "'%(value)s' waarde moet óf True of False wees."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boole (Eder waar of vals)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (tot %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Kommas geskeide heelgetalle"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
+"'%(value)s' waarde het 'n ongeldige datumformaat. Dit met in die JJJJ-MM-DD "
+"formaat wees."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
+"'%(value)s' waarde het die korrekte formaat (JJJJ-MM-DD), maar dit is 'n "
+"ongeldige datum."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Datum (sonder die tyd)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
+"'%(value)s' waarde se formaat is ongeldig. Dit moet in JJJJ-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] formaat wees."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
+"'%(value)s' waarde het die korrekte formaat (JJJJ-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) maar dit is 'n ongeldige datum/tyd."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Datum (met die tyd)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
-msgstr ""
+msgstr "'%(value)s' waarde moet 'n desimale getal wees."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Desimale getal"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "E-pos adres"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Lêer pad"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
-msgstr ""
+msgstr "'%(value)s' waarde meote 'n dryfpunt getal wees."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Dryfpunt getal"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Groot (8 greep) heelgetal"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 adres"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP adres"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr ""
+msgstr "'%(value)s' waarde moet óf None, True of False wees."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boole (Eder waar, vals of niks)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Positiewe heelgetal"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Positiewe klein heelgetal"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (tot by %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Klein heelgetal"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Teks"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
+"'%(value)s' waarde se formaat is ongeldig. Dit moet in HH:MM[:ss[.uuuuuu]] "
+"formaat wees."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
+"'%(value)s' waarde het die regte formaat (HH:MM[:ss[.uuuuuu]]) maar is nie "
+"'n geldige tyd nie."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Tyd"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
-msgstr ""
+msgstr "Rou binêre data"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Lêer"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Prent"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Vreemde sleutel (tipe bepaal deur verwante veld)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Een-tot-een-verhouding"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Baie-tot-baie-verwantskap"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Die veld is verpligtend."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Sleutel 'n hele getal in."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Sleutel 'n nommer in."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Maak seker dat daar nie meer as %(max)s syfer in totaal is nie."
+msgstr[1] "Maak seker dat daar nie meer as %(max)s syfers in totaal is nie."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Maak seker dat daar nie meer as %(max)s desimale plek is nie."
+msgstr[1] "Maak seker dat daar nie meer as %(max)s desimale plekke is nie."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
msgid_plural ""
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] ""
+"Maak seker dat daar nie meer as %(max)s syfer voor die desimale punt is nie."
msgstr[1] ""
+"Maak seker dat daar nie meer as %(max)s syfers voor die desimale punt is nie."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Sleutel 'n geldige datum in."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Sleutel 'n geldige tyd in."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Sleutel 'n geldige datum/tyd in."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Geen lêer is ingedien nie. Maak seker die kodering tipe op die vorm is reg."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Geen lêer is ingedien nie."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Die ingedien lêer is leeg."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr[0] ""
+"Maak seker hierdie lêernaam het op die meeste %(max)d karakter (dit het "
+"%(length)d)."
msgstr[1] ""
+"Maak seker hierdie lêernaam het op die meeste %(max)d karakters (dit het "
+"%(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Stuur die lêer of tiek die maak skoon boksie, nie beide nie."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -710,63 +778,74 @@
"Laai 'n geldige prent. Die lêer wat jy opgelaai het is nie 'n prent nie of "
"dit is 'n korrupte prent."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Kies 'n geldige keuse. %(value)s is nie een van die beskikbare keuses nie."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Sleatel 'n lys van waardes in."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Sleutel 'n volledige waarde in."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
-msgstr ""
+msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
+msgstr "(Versteekte veld %(name)s) %(error)s"
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
-msgstr ""
+msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dien asseblief %d of minder vorms in."
+msgstr[1] "Dien asseblief %d of minder vorms in."
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Dien asseblief %d of meer vorms in."
+msgstr[1] "Dien asseblief %d of meer vorms in."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Orde"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Verwyder"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Korrigeer die dubbele data vir %(field)s ."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Korrigeer die dubbele data vir %(field)s , dit moet uniek wees."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -775,34 +854,34 @@
"Korrigeer die dubbele data vir %(field_name)s, dit moet uniek wees vir die "
"%(lookup)s in %(date_field)s ."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Korrigeer die dubbele waardes hieronder."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Die inlyn vreemde sleutel stem nie ooreen met die ouer primêre sleutel."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Kies 'n geldige keuse. Daardie keuse is nie een van die beskikbare keuses "
"nie."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%(pk)s\" is nie 'n geldige waarde vir 'n primêre sleutel nie."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Hou die \"Control\" knoppie, of \"Command\" op 'n Mac, onder om meer as een "
"te kies."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -811,15 +890,15 @@
"%(datetime)s kon nie in tydsone %(current_timezone)s vertolk word nie; dit "
"mag dubbelsinnig wees, of nie bestaan nie."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
-msgstr "Op die oomblik"
+msgstr "Tans"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Verander"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Maak skoon"
@@ -835,63 +914,63 @@
msgid "No"
msgstr "Nee"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
-msgstr "Ja, nee, miskien"
+msgstr "ja,nee,miskien"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d greep"
msgstr[1] "%(size)d grepe"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
-msgstr "p.m."
+msgstr "nm"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
-msgstr "a.m."
+msgstr "vm"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
-msgstr "PM"
+msgstr "NM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
-msgstr "AM"
+msgstr "VM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "middernag"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "middag"
@@ -1017,7 +1096,7 @@
#: utils/dates.py:23
msgid "may"
-msgstr "mag"
+msgstr "mei"
#: utils/dates.py:23
msgid "jun"
@@ -1167,117 +1246,133 @@
msgid "December"
msgstr "Desember"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr ""
+msgstr "HIerdie is nie 'n geldige IPv6-adres nie."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "of"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ","
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d jaar"
+msgstr[1] "%d jare"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d maand"
+msgstr[1] "%d maande"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d week"
+msgstr[1] "%d weke"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d dag"
+msgstr[1] "%d dae"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d uur"
+msgstr[1] "%d ure"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minuut"
+msgstr[1] "%d minute"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
+msgstr "0 minute"
+
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Verbied"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Gids indekse word nie hier toegelaat nie."
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" bestaan nie"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Indeks van %(directory)s"
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Meer inligting is beskikbaar met DEBUG=True."
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Geen jaar gespesifiseer"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Geen maand gespesifiseer"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Geen dag gespesifiseer"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Geen week gespesifiseer"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Geen %(verbose_name_plural)s beskikbaar nie"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1286,7 +1381,7 @@
"Toekomstige %(verbose_name_plural)s is nie beskikbaar nie, omdat "
"%(class_name)s.allow_future vals is."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1297,18 +1392,32 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Geen %(verbose_name)s gevind vir die soektog"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Bladsy is nie 'laaste' nie, en dit kan nie omgeskakel word na 'n heelgetal "
"nie."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Ongeldige bladsy (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Leë lys en ' %(class_name)s.allow_empty' is vals."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Gids indekse word nie hier toegelaat nie."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" bestaan nie"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indeks van %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/ar/formats.py python-django-1.7.4/django/conf/locale/ar/formats.py
--- python-django-1.6.6/django/conf/locale/ar/formats.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ar/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -7,18 +7,18 @@
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'j F، Y'
TIME_FORMAT = 'g:i:s A'
-# DATETIME_FORMAT =
+# DATETIME_FORMAT =
YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'd/m/Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/ar/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ar/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/ar/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ar/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/ar/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ar/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -1,16 +1,17 @@
# This file is distributed under the same license as the Django package.
#
# Translators:
-# dado_eyad , 2013
+# Bashar Al-Abdulhadi, 2014
+# Eyad Toma , 2013-2014
# Jannis Leidel , 2011
# Ossama Khayat , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-10-28 09:36+0000\n"
-"Last-Translator: dado_eyad \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-28 17:53+0000\n"
+"Last-Translator: Bashar Al-Abdulhadi\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/django/language/"
"ar/)\n"
"MIME-Version: 1.0\n"
@@ -29,6 +30,10 @@
msgstr "العربيّة"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "الأسترية"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "الأذربيجانية"
@@ -81,318 +86,346 @@
msgstr "الإنجليزيّة"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "الإنجليزية الإسترالية"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "الإنجليزيّة البريطانيّة"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "الاسبرانتو"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "الإسبانيّة"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "الأسبانية الأرجنتينية"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "الأسبانية المكسيكية"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "الإسبانية النيكاراغوية"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "الإسبانية الفنزويلية"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "الإستونيّة"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "الباسك"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "الفارسيّة"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "الفنلنديّة"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "الفرنسيّة"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "الفريزيّة"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "الإيرلنديّة"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "الجليقيّة"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "العبريّة"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "الهندية"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "الكرواتيّة"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "الهنغاريّة"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "اللغة الوسيطة"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "الإندونيسيّة"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr "ايدو"
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "الآيسلنديّة"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "الإيطاليّة"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "اليابانيّة"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "الجورجيّة"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "الكازاخستانية"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "الخمر"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "الهنديّة (كنّادا)"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "الكوريّة"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "اللوكسمبرجية"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "اللتوانيّة"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "اللاتفيّة"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "المقدونيّة"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "المايالام"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "المنغوليّة"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr "المهاراتية"
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "البورمية"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "البوكمال نرويجيّة"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "النيبالية"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "الهولنديّة"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "النينورسك نرويجيّة"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "الأوسيتيكية"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "البنجابيّة"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "البولنديّة"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "البرتغاليّة"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "البرتغاليّة البرازيليّة"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "الرومانيّة"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "الروسيّة"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "السلوفاكيّة"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "السلوفانيّة"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "الألبانيّة"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "الصربيّة"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "اللاتينيّة الصربيّة"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "السويديّة"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "السواحلية"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "التاميل"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "التيلوغو"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "التايلنديّة"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "التركيّة"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "التتاريية"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "الأدمرتية"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "الأكرانيّة"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "الأوردو"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "الفيتناميّة"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "الصينيّة المبسطة"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "الصينيّة التقليدية"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "خرائط الموقع"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "الملفات الثابتة"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "توظيف النشر"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "تصميم الموقع"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "أدخل قيمة صحيحة."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "أدخل رابطاً صحيحاً."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr ""
+msgstr "أدخل رقم صالح."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "أدخل عنوان بريد إلكتروني صحيح."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "أدخل عنوان IPv4 صحيح."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "أدخل عنوان IPv6 صحيح."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "أدخل عنوان IPv4 أو عنوان IPv6 صحيح."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "أدخل أرقاما فقط مفصول بينها بفواصل."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "تحقق من أن هذه القيمة هي %(limit_value)s (إنها %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "تحقق من أن تكون هذه القيمة أقل من %(limit_value)s أو مساوية لها."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "تحقق من أن تكون هذه القيمة أكثر من %(limit_value)s أو مساوية لها."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -401,13 +434,25 @@
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأقل (هي تحتوي "
+"حالياً على %(show_value)d)."
msgstr[1] ""
+"تأكد أن هذه القيمة تحتوي على حرف أو رمز %(limit_value)d على الأقل (هي تحتوي "
+"حالياً على %(show_value)d)."
msgstr[2] ""
+"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف و رمز على الأقل (هي تحتوي "
+"حالياً على %(show_value)d)."
msgstr[3] ""
+"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأقل (هي تحتوي "
+"حالياً على %(show_value)d)."
msgstr[4] ""
+"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأقل (هي تحتوي "
+"حالياً على %(show_value)d)."
msgstr[5] ""
+"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأقل (هي تحتوي "
+"حالياً على %(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -416,314 +461,356 @@
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي "
+"حالياً على %(show_value)d)."
msgstr[1] ""
+"تأكد أن هذه القيمة تحتوي على حرف أو رمز %(limit_value)d على الأكثر (هي تحتوي "
+"حالياً على %(show_value)d)."
msgstr[2] ""
+"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف و رمز على الأكثر (هي تحتوي "
+"حالياً على %(show_value)d)."
msgstr[3] ""
+"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي "
+"حالياً على %(show_value)d)."
msgstr[4] ""
+"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي "
+"حالياً على %(show_value)d)."
msgstr[5] ""
+"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي "
+"حالياً على %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s يجب أن يكون مُميّزاً مع %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "و"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "النموذج %(model_name)s والحقل %(field_label)s موجود مسبقاً."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s بهذا %(field_labels)s موجود سلفاً."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
-msgstr ""
+msgstr "القيمة %(value)r ليست خيارا صحيحاً."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "لا يمكن تعيين null كقيمة لهذا الحقل."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "لا يمكن ترك هذا الحقل فارغاً."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "النموذج %(model_name)s والحقل %(field_label)s موجود مسبقاً."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s يجب أن يكون فريد لـ %(date_field_label)s %(lookup_type)s."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "حقل نوع: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "عدد صحيح"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr ""
+msgstr "قيمة '%(value)s' يجب ان تكون عدد صحيح."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr ""
+msgstr "قيمة '%(value)s' يجب أن تكون True أو False."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "ثنائي (إما True أو False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "سلسلة نص (%(max_length)s كحد أقصى)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "أرقام صحيحة مفصولة بفواصل"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
+"قيمة '%(value)s' ليست من بُنية تاريخ صحيحة. القيمة يجب ان تكون من البُنية YYYY-"
+"MM-DD."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
-msgstr ""
+msgstr "قيمة '%(value)s' من بُنية صحيحة (YYYY-MM-DD) لكنها تحوي تاريخ غير صحيح."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "التاريخ (دون الوقت)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
+"قيمة '%(value)s' ليست من بُنية صحيحة. القيمة يجب ان تكون من البُنية YYYY-MM-DD "
+"HH:MM[:ss[.uuuuuu]][TZ] ."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
+"قيمة '%(value)s' من بُنية صحيحة (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) لكنها "
+"تحوي وقت و تاريخ غير صحيحين."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "التاريخ (مع الوقت)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
-msgstr ""
+msgstr "قيمة '%(value)s' يجب ان تكون عدد عشري."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "رقم عشري"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "عنوان بريد إلكتروني"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "مسار الملف"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
-msgstr ""
+msgstr "قيمة '%(value)s' يجب ان تكون عدد فاصل عائم."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "رقم فاصلة عائمة"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "عدد صحيح كبير (8 بايت)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "عنوان IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "عنوان IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr ""
+msgstr "قيمة '%(value)s' يجب ان تكون None أو True أو False."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "ثنائي (إما True أو False أو None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "عدد صحيح موجب"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "عدد صحيح صغير موجب"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Slug (حتى %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "عدد صحيح صغير"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "نص"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
+"قيمة '%(value)s' ليست من بُنية صحيحة. القيمة يجب ان تكون من البُنية HH:MM[:ss[."
+"uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
+"قيمة '%(value)s' من بُنية صحيحة (HH:MM[:ss[.uuuuuu]]) لكنها تحوي وقت غير صحيح."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "وقت"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "رابط"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
-msgstr ""
+msgstr "البيانات الثنائية الخام"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "ملف"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "صورة"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
-msgstr ""
+msgstr "النموذج %(model)s ذو الحقل الرئيسي %(pk)r غير موجود."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "الحقل المرتبط (تم تحديد النوع وفقاً للحقل المرتبط)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "علاقة واحد إلى واحد"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "علاقة متعدد إلى متعدد"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "هذا الحقل مطلوب."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "أدخل رقما صحيحا."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "أدخل رقماً."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
+msgstr[1] "تحقق من أن تدخل رقم %(max)s لا أكثر."
+msgstr[2] "تحقق من أن تدخل %(max)s رقمين لا أكثر."
+msgstr[3] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
+msgstr[4] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
+msgstr[5] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
+msgstr[1] "تحقق من أن تدخل خانة %(max)s عشرية لا أكثر."
+msgstr[2] "تحقق من أن تدخل %(max)s خانتين عشريتين لا أكثر."
+msgstr[3] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
+msgstr[4] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
+msgstr[5] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
msgid_plural ""
"Ensure that there are no more than %(max)s digits before the decimal point."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
+msgstr[1] "تحقق من أن تدخل رقم %(max)s قبل الفاصل العشري لا أكثر."
+msgstr[2] "تحقق من أن تدخل %(max)s رقمين قبل الفاصل العشري لا أكثر."
+msgstr[3] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
+msgstr[4] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
+msgstr[5] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "أدخل تاريخاً صحيحاً."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "أدخل وقتاً صحيحاً."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "أدخل تاريخاً/وقتاً صحيحاً."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "لم يتم ارسال ملف، الرجاء التأكد من نوع ترميز الاستمارة."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "لم يتم إرسال اي ملف."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "الملف الذي قمت بإرساله فارغ."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr[0] ""
+"تأكد أن إسم هذا الملف يحتوي على %(max)d حرف على الأكثر (هو يحتوي الآن على "
+"%(length)d حرف)."
msgstr[1] ""
+"تأكد أن إسم هذا الملف يحتوي على حرف %(max)d على الأكثر (هو يحتوي الآن على "
+"%(length)d حرف)."
msgstr[2] ""
+"تأكد أن إسم هذا الملف يحتوي على %(max)d حرفين على الأكثر (هو يحتوي الآن على "
+"%(length)d حرف)."
msgstr[3] ""
+"تأكد أن إسم هذا الملف يحتوي على %(max)d حرف على الأكثر (هو يحتوي الآن على "
+"%(length)d حرف)."
msgstr[4] ""
+"تأكد أن إسم هذا الملف يحتوي على %(max)d حرف على الأكثر (هو يحتوي الآن على "
+"%(length)d حرف)."
msgstr[5] ""
+"تأكد أن إسم هذا الملف يحتوي على %(max)d حرف على الأكثر (هو يحتوي الآن على "
+"%(length)d حرف)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "رجاءً أرسل ملف أو صح علامة صح عند مربع اختيار \"فارغ\"، وليس كلاهما."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -731,66 +818,81 @@
"قم برفع صورة صحيحة، الملف الذي قمت برفعه إما أنه ليس ملفا لصورة أو أنه ملف "
"معطوب."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "انتق خياراً صحيحاً. %(value)s ليس أحد الخيارات المتاحة."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "أدخل قائمة من القيم."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "إدخال قيمة كاملة."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
-msgstr ""
+msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
+msgstr "(الحقل الخفي %(name)s) %(error)s"
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
-msgstr ""
+msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
+msgstr "بيانات ManagementForm مفقودة أو تم العبث بها"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "الرجاء إرسال %d إستمارة أو أقل."
+msgstr[1] "الرجاء إرسال إستمارة %d أو أقل"
+msgstr[2] "الرجاء إرسال %d إستمارتين أو أقل"
+msgstr[3] "الرجاء إرسال %d إستمارة أو أقل"
+msgstr[4] "الرجاء إرسال %d إستمارة أو أقل"
+msgstr[5] "الرجاء إرسال %d إستمارة أو أقل"
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "الرجاء إرسال %d إستمارة أو أكثر."
+msgstr[1] "الرجاء إرسال إستمارة %d أو أكثر."
+msgstr[2] "الرجاء إرسال %d إستمارتين أو أكثر."
+msgstr[3] "الرجاء إرسال %d إستمارة أو أكثر."
+msgstr[4] "الرجاء إرسال %d إستمارة أو أكثر."
+msgstr[5] "الرجاء إرسال %d إستمارة أو أكثر."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "الترتيب"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "احذف"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "رجاء صحّح بيانات %(field)s المتكررة."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "رجاء صحّح بيانات %(field)s المتكررة والتي يجب أن تكون مُميّزة."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -799,46 +901,48 @@
"رجاء صحّح بيانات %(field_name)s المتكررة والتي يجب أن تكون مُميّزة لـ%(lookup)s "
"في %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "رجاءً صحّح القيم المُكرّرة أدناه."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "حقل foreign key المحدد لا يطابق الحقل الرئيسي له."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%(pk)s\" قيمة غير صحيحة للرقم المرجعي."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"اضغط زر التحكم \"Control\", أو \"Command\" على أجهزة Mac لاختيار أكثر من "
"واحد."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
+"%(datetime)s لا يمكن تفسيرها في المنطقة الزمنية %(current_timezone)s; قد "
+"تكون غامضة أو أنها غير موجودة."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "حالياً"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "عدّل"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "تفريغ"
@@ -854,11 +958,11 @@
msgid "No"
msgstr "لا"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "نعم,لا,ربما"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -869,52 +973,52 @@
msgstr[4] "%(size)d بايت"
msgstr[5] "%(size)d بايت"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s ك.ب"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s م.ب"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s ج.ب"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s ت.ب"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s ب.ب"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "م"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "ص"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "م"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "ص"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "منتصف الليل"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "ظهراً"
@@ -1190,141 +1294,168 @@
msgid "December"
msgstr "ديسمبر"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr ""
+msgstr "هذا ليس عنوان IPv6 صحيح."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
-msgstr ""
+msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "أو"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr "، "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "%d سنة"
+msgstr[1] "%d سنة"
+msgstr[2] "%d سنوات"
+msgstr[3] "%d سنوات"
+msgstr[4] "%d سنوات"
+msgstr[5] "%d سنوات"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "%d شهر"
+msgstr[1] "%d شهر"
+msgstr[2] "%d شهرين"
+msgstr[3] "%d أشهر"
+msgstr[4] "%d شهر"
+msgstr[5] "%d شهر"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "%d اسبوع."
+msgstr[1] "%d اسبوع."
+msgstr[2] "%d أسبوعين"
+msgstr[3] "%d أسابيع"
+msgstr[4] "%d اسبوع."
+msgstr[5] "%d أسبوع"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "%d يوم"
+msgstr[1] "%d يوم"
+msgstr[2] "%d يومان"
+msgstr[3] "%d أيام"
+msgstr[4] "%d يوم"
+msgstr[5] "%d يوم"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "%d ساعة"
+msgstr[1] "%d ساعة واحدة"
+msgstr[2] "%d ساعتين"
+msgstr[3] "%d ساعات"
+msgstr[4] "%d ساعة"
+msgstr[5] "%d ساعة"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "%d دقيقة"
+msgstr[1] "%d دقيقة"
+msgstr[2] "%d دقيقتين"
+msgstr[3] "%d دقائق"
+msgstr[4] "%d دقيقة"
+msgstr[5] "%d دقيقة"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
-msgstr ""
+msgstr "0 دقيقة"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr ""
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "ممنوع"
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr ""
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "تم الفشل للتحقق من CSRF. تم إنهاء الطلب."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"أنت ترى هذه الرسالة لأن هذا الموقع HTTPS يتطلب إرسال 'Referer header' من "
+"قبل المتصفح، ولكن لم تم إرسال أي شيء. هذا الـheader مطلوب لأسباب أمنية، "
+"لضمان أن متصفحك لم يتم اختطافه من قبل أطراف أخرى."
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"إذا قمت بضبط متصفحك لتعطيل 'Referer headers'، يرجى إعادة تفعيلها، على الأقل "
+"بالنسبة لهذا الموقع، أو لاتصالات HTTPS، أو للطلبات من نفس المنشأ 'same-"
+"origin'."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"أنت ترى هذه الرسالة لأن هذا الموقع يتطلب كعكة CSRF عند تقديم النماذج. ملف "
+"الكعكة هذا مطلوب لأسباب أمنية في تعريف الإرتباط، لضمان أنه لم يتم اختطاف "
+"المتصفح من قبل أطراف أخرى."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
msgstr ""
+"إذا قمت بضبط المتصفح لتعطيل الكوكيز الرجاء إعادة تغعيلها، على الأقل بالنسبة "
+"لهذا الموقع، أو للطلبات من نفس المنشأ 'same-origin'."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "يتوفر مزيد من المعلومات عند ضبط الخيار DEBUG=True."
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "لم تحدد السنة"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "لم تحدد الشهر"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "لم تحدد اليوم"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "لم تحدد الأسبوع"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "لا يوجد %(verbose_name_plural)s"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1333,7 +1464,7 @@
"التاريخ بالمستقبل %(verbose_name_plural)s غير متوفر لأن قيمة %(class_name)s."
"allow_future هي False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "نسق تاريخ غير صحيح '%(datestr)s' محدد بالشكل '%(format)s'"
@@ -1343,16 +1474,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "لم يعثر على أي %(verbose_name)s مطابقة لهذا الإستعلام"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "الصفحة ليست 'الأخيرة'، ولا يمكن تحويل القيمة إلى رقم صحيح."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr ""
+msgstr "صفحة خاطئة (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "قائمة فارغة و '%(class_name)s.allow_empty' قيمته False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "لا يسمح لفهارس الدليل هنا."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "المسار \"%(path)s\" غير موجود."
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "فهرس لـ %(directory)s"
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/ast/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ast/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/ast/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ast/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/ast/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ast/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -0,0 +1,1402 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Ḷḷumex03 , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/django/language/"
+"ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: conf/global_settings.py:51
+msgid "Afrikaans"
+msgstr "Afrikáans"
+
+#: conf/global_settings.py:52
+msgid "Arabic"
+msgstr "Árabe"
+
+#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Azerbaijani"
+msgstr "Azerbaixanu"
+
+#: conf/global_settings.py:54
+msgid "Bulgarian"
+msgstr "Búlgaru"
+
+#: conf/global_settings.py:55
+msgid "Belarusian"
+msgstr "Bielorrusu"
+
+#: conf/global_settings.py:56
+msgid "Bengali"
+msgstr "Bengalí"
+
+#: conf/global_settings.py:57
+msgid "Breton"
+msgstr "Bretón"
+
+#: conf/global_settings.py:58
+msgid "Bosnian"
+msgstr "Bosniu"
+
+#: conf/global_settings.py:59
+msgid "Catalan"
+msgstr "Catalán"
+
+#: conf/global_settings.py:60
+msgid "Czech"
+msgstr "Checu"
+
+#: conf/global_settings.py:61
+msgid "Welsh"
+msgstr "Galés"
+
+#: conf/global_settings.py:62
+msgid "Danish"
+msgstr "Danés"
+
+#: conf/global_settings.py:63
+msgid "German"
+msgstr "Alemán"
+
+#: conf/global_settings.py:64
+msgid "Greek"
+msgstr "Griegu"
+
+#: conf/global_settings.py:65
+msgid "English"
+msgstr "Inglés"
+
+#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
+msgid "British English"
+msgstr "Inglés británicu"
+
+#: conf/global_settings.py:68
+msgid "Esperanto"
+msgstr "Esperantu"
+
+#: conf/global_settings.py:69
+msgid "Spanish"
+msgstr "Castellán"
+
+#: conf/global_settings.py:70
+msgid "Argentinian Spanish"
+msgstr "Español arxentín"
+
+#: conf/global_settings.py:71
+msgid "Mexican Spanish"
+msgstr "Español mexicanu"
+
+#: conf/global_settings.py:72
+msgid "Nicaraguan Spanish"
+msgstr "Español nicaraguanu"
+
+#: conf/global_settings.py:73
+msgid "Venezuelan Spanish"
+msgstr "Español venezolanu"
+
+#: conf/global_settings.py:74
+msgid "Estonian"
+msgstr "Estoniu"
+
+#: conf/global_settings.py:75
+msgid "Basque"
+msgstr "Vascu"
+
+#: conf/global_settings.py:76
+msgid "Persian"
+msgstr "Persa"
+
+#: conf/global_settings.py:77
+msgid "Finnish"
+msgstr "Finés"
+
+#: conf/global_settings.py:78
+msgid "French"
+msgstr "Francés"
+
+#: conf/global_settings.py:79
+msgid "Frisian"
+msgstr "Frisón"
+
+#: conf/global_settings.py:80
+msgid "Irish"
+msgstr "Irlandés"
+
+#: conf/global_settings.py:81
+msgid "Galician"
+msgstr "Gallegu"
+
+#: conf/global_settings.py:82
+msgid "Hebrew"
+msgstr "Hebréu"
+
+#: conf/global_settings.py:83
+msgid "Hindi"
+msgstr "Hindi"
+
+#: conf/global_settings.py:84
+msgid "Croatian"
+msgstr "Croata"
+
+#: conf/global_settings.py:85
+msgid "Hungarian"
+msgstr "Húngaru"
+
+#: conf/global_settings.py:86
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:87
+msgid "Indonesian"
+msgstr "Indonesiu"
+
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
+msgid "Icelandic"
+msgstr "Islandés"
+
+#: conf/global_settings.py:89
+msgid "Italian"
+msgstr "Italianu"
+
+#: conf/global_settings.py:90
+msgid "Japanese"
+msgstr "Xaponés"
+
+#: conf/global_settings.py:91
+msgid "Georgian"
+msgstr "Xeorxanu"
+
+#: conf/global_settings.py:92
+msgid "Kazakh"
+msgstr "Kazakh"
+
+#: conf/global_settings.py:93
+msgid "Khmer"
+msgstr "Khmer"
+
+#: conf/global_settings.py:94
+msgid "Kannada"
+msgstr "Canarés"
+
+#: conf/global_settings.py:95
+msgid "Korean"
+msgstr "Coreanu"
+
+#: conf/global_settings.py:96
+msgid "Luxembourgish"
+msgstr "Luxemburgués"
+
+#: conf/global_settings.py:97
+msgid "Lithuanian"
+msgstr "Lituanu"
+
+#: conf/global_settings.py:98
+msgid "Latvian"
+msgstr "Letón"
+
+#: conf/global_settings.py:99
+msgid "Macedonian"
+msgstr "Macedoniu"
+
+#: conf/global_settings.py:100
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: conf/global_settings.py:101
+msgid "Mongolian"
+msgstr "Mongol"
+
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr "Birmanu"
+
+#: conf/global_settings.py:103
+msgid "Norwegian Bokmal"
+msgstr "Bokmal noruegu"
+
+#: conf/global_settings.py:104
+msgid "Nepali"
+msgstr "Nepalí"
+
+#: conf/global_settings.py:105
+msgid "Dutch"
+msgstr "Holandés"
+
+#: conf/global_settings.py:106
+msgid "Norwegian Nynorsk"
+msgstr "Nynorsk noruegu"
+
+#: conf/global_settings.py:107
+msgid "Ossetic"
+msgstr "Osetiu"
+
+#: conf/global_settings.py:108
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: conf/global_settings.py:109
+msgid "Polish"
+msgstr "Polacu"
+
+#: conf/global_settings.py:110
+msgid "Portuguese"
+msgstr "Portugués"
+
+#: conf/global_settings.py:111
+msgid "Brazilian Portuguese"
+msgstr "Portugués brasileñu"
+
+#: conf/global_settings.py:112
+msgid "Romanian"
+msgstr "Rumanu"
+
+#: conf/global_settings.py:113
+msgid "Russian"
+msgstr "Rusu"
+
+#: conf/global_settings.py:114
+msgid "Slovak"
+msgstr "Eslovacu"
+
+#: conf/global_settings.py:115
+msgid "Slovenian"
+msgstr "Eslovenu"
+
+#: conf/global_settings.py:116
+msgid "Albanian"
+msgstr "Albanu"
+
+#: conf/global_settings.py:117
+msgid "Serbian"
+msgstr "Serbiu"
+
+#: conf/global_settings.py:118
+msgid "Serbian Latin"
+msgstr "Serbiu llatín"
+
+#: conf/global_settings.py:119
+msgid "Swedish"
+msgstr "Suecu"
+
+#: conf/global_settings.py:120
+msgid "Swahili"
+msgstr "Suaḥili"
+
+#: conf/global_settings.py:121
+msgid "Tamil"
+msgstr "Tamil"
+
+#: conf/global_settings.py:122
+msgid "Telugu"
+msgstr "Telugu"
+
+#: conf/global_settings.py:123
+msgid "Thai"
+msgstr "Tailandés"
+
+#: conf/global_settings.py:124
+msgid "Turkish"
+msgstr "Turcu"
+
+#: conf/global_settings.py:125
+msgid "Tatar"
+msgstr "Tatar"
+
+#: conf/global_settings.py:126
+msgid "Udmurt"
+msgstr "Udmurtu"
+
+#: conf/global_settings.py:127
+msgid "Ukrainian"
+msgstr "Ucranianu"
+
+#: conf/global_settings.py:128
+msgid "Urdu"
+msgstr "Urdu"
+
+#: conf/global_settings.py:129
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: conf/global_settings.py:130 conf/global_settings.py:131
+msgid "Simplified Chinese"
+msgstr "Chinu simplificáu"
+
+#: conf/global_settings.py:132 conf/global_settings.py:133
+msgid "Traditional Chinese"
+msgstr "Chinu tradicional"
+
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
+#: core/validators.py:21
+msgid "Enter a valid value."
+msgstr "Introduz un valor válidu."
+
+#: core/validators.py:77 forms/fields.py:675
+msgid "Enter a valid URL."
+msgstr "Introduz una URL válida."
+
+#: core/validators.py:115
+msgid "Enter a valid integer."
+msgstr ""
+
+#: core/validators.py:120
+msgid "Enter a valid email address."
+msgstr "Introduz una direición de corréu válida."
+
+#: core/validators.py:185
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Introduz un 'slug' válidu que consista en lletres, númberu, guiones baxos o "
+"medios. "
+
+#: core/validators.py:188 core/validators.py:207
+msgid "Enter a valid IPv4 address."
+msgstr "Introduz una direición IPv4 válida."
+
+#: core/validators.py:193 core/validators.py:208
+msgid "Enter a valid IPv6 address."
+msgstr "Introduz una direición IPv6 válida."
+
+#: core/validators.py:203 core/validators.py:206
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Introduz una direición IPv4 o IPv6 válida."
+
+#: core/validators.py:229 db/models/fields/__init__.py:1070
+msgid "Enter only digits separated by commas."
+msgstr "Introduz namái díxitos separtaos per comes."
+
+#: core/validators.py:236
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr "Asegúrate qu'esti valor ye %(limit_value)s (ye %(show_value)s)."
+
+#: core/validators.py:255
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr "Asegúrate qu'esti valor ye menor o igual a %(limit_value)s."
+
+#: core/validators.py:262
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr "Asegúrate qu'esti valor ye mayor o igual a %(limit_value)s."
+
+#: core/validators.py:271
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+"Asegúrate qu'esti valor tien polo menos %(limit_value)d caráuter (tien "
+"%(show_value)d)."
+msgstr[1] ""
+"Asegúrate qu'esti valor tien polo menos %(limit_value)d caráuteres (tien "
+"%(show_value)d)."
+
+#: core/validators.py:282
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+"Asegúrate qu'esti valor tien como muncho %(limit_value)d caráuter (tien "
+"%(show_value)d)."
+msgstr[1] ""
+"Asegúrate qu'esti valor tien como muncho %(limit_value)d caráuteres (tien "
+"%(show_value)d)."
+
+#: db/models/base.py:975 forms/models.py:718
+msgid "and"
+msgstr "y"
+
+#: db/models/base.py:977
+#, python-format
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
+
+#: db/models/fields/__init__.py:104
+#, python-format
+msgid "Value %(value)r is not a valid choice."
+msgstr ""
+
+#: db/models/fields/__init__.py:105
+msgid "This field cannot be null."
+msgstr "Esti campu nun pue ser nulu."
+
+#: db/models/fields/__init__.py:106
+msgid "This field cannot be blank."
+msgstr "Esti campu nun pue tar baleru."
+
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s con esti %(field_label)s yá esiste."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campu de la triba: %(field_type)s"
+
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
+msgid "Integer"
+msgstr "Enteru"
+
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: db/models/fields/__init__.py:926
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:928
+msgid "Boolean (Either True or False)"
+msgstr "Boleanu (tamién True o False)"
+
+#: db/models/fields/__init__.py:1004
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Cadena (fasta %(max_length)s)"
+
+#: db/models/fields/__init__.py:1065
+msgid "Comma-separated integers"
+msgstr "Enteros separtaos per coma"
+
+#: db/models/fields/__init__.py:1080
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: db/models/fields/__init__.py:1085
+msgid "Date (without time)"
+msgstr "Data (ensin hora)"
+
+#: db/models/fields/__init__.py:1187
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1191
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1195
+msgid "Date (with time)"
+msgstr "Data (con hora)"
+
+#: db/models/fields/__init__.py:1297
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: db/models/fields/__init__.py:1299
+msgid "Decimal number"
+msgstr "Númberu decimal"
+
+#: db/models/fields/__init__.py:1444
+msgid "Email address"
+msgstr "Direición de corréu"
+
+#: db/models/fields/__init__.py:1470
+msgid "File path"
+msgstr "Camín del ficheru"
+
+#: db/models/fields/__init__.py:1537
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: db/models/fields/__init__.py:1539
+msgid "Floating point number"
+msgstr "Númberu de puntu flotante"
+
+#: db/models/fields/__init__.py:1623
+msgid "Big (8 byte) integer"
+msgstr "Enteru big (8 byte)"
+
+#: db/models/fields/__init__.py:1638
+msgid "IPv4 address"
+msgstr "Direición IPv4"
+
+#: db/models/fields/__init__.py:1668
+msgid "IP address"
+msgstr "Direición IP"
+
+#: db/models/fields/__init__.py:1747
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:1749
+msgid "Boolean (Either True, False or None)"
+msgstr "Boleanu (tamién True, False o None)"
+
+#: db/models/fields/__init__.py:1809
+msgid "Positive integer"
+msgstr "Enteru positivu"
+
+#: db/models/fields/__init__.py:1821
+msgid "Positive small integer"
+msgstr "Enteru pequeñu positivu"
+
+#: db/models/fields/__init__.py:1834
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (fasta %(max_length)s)"
+
+#: db/models/fields/__init__.py:1863
+msgid "Small integer"
+msgstr "Enteru pequeñu"
+
+#: db/models/fields/__init__.py:1870
+msgid "Text"
+msgstr "Testu"
+
+#: db/models/fields/__init__.py:1893
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1895
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1898
+msgid "Time"
+msgstr "Hora"
+
+#: db/models/fields/__init__.py:1977
+msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/__init__.py:2000
+msgid "Raw binary data"
+msgstr "Datos binarios crudos"
+
+#: db/models/fields/files.py:225
+msgid "File"
+msgstr "Ficheru"
+
+#: db/models/fields/files.py:375
+msgid "Image"
+msgstr "Imaxe"
+
+#: db/models/fields/related.py:1580
+#, python-format
+msgid "%(model)s instance with pk %(pk)r does not exist."
+msgstr ""
+
+#: db/models/fields/related.py:1582
+msgid "Foreign Key (type determined by related field)"
+msgstr "Clave foriata (triba determinada pol campu rellacionáu)"
+
+#: db/models/fields/related.py:1773
+msgid "One-to-one relationship"
+msgstr "Rellación a ún"
+
+#: db/models/fields/related.py:1843
+msgid "Many-to-many relationship"
+msgstr "Rellación a munchos"
+
+#: forms/fields.py:55
+msgid "This field is required."
+msgstr "Requierse esti campu."
+
+#: forms/fields.py:236
+msgid "Enter a whole number."
+msgstr "Introduz un númberu completu"
+
+#: forms/fields.py:279 forms/fields.py:316
+msgid "Enter a number."
+msgstr "Introduz un númberu."
+
+#: forms/fields.py:318
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] "Asegúrate que nun hai más de %(max)s díxitu en total."
+msgstr[1] "Asegúrate que nun hai más de %(max)s díxitos en total."
+
+#: forms/fields.py:322
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] "Asegúrate que nun hai más de %(max)s allugamientu decimal."
+msgstr[1] "Asegúrate que nun hai más de %(max)s allugamientos decimales."
+
+#: forms/fields.py:326
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+"Asegúrate que nun hai más de %(max)s díxitu enantes del puntu decimal."
+msgstr[1] ""
+"Asegúrate que nun hai más de %(max)s díxitos enantes del puntu decimal."
+
+#: forms/fields.py:437 forms/fields.py:1139
+msgid "Enter a valid date."
+msgstr "Introduz una data válida."
+
+#: forms/fields.py:461 forms/fields.py:1140
+msgid "Enter a valid time."
+msgstr "Introduz una hora válida."
+
+#: forms/fields.py:483
+msgid "Enter a valid date/time."
+msgstr "Introduz una data/hora válida."
+
+#: forms/fields.py:564
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "Nun s'unvió'l ficheru. Comprueba la triba de cifráu nel formulariu."
+
+#: forms/fields.py:565
+msgid "No file was submitted."
+msgstr "No file was submitted."
+
+#: forms/fields.py:566
+msgid "The submitted file is empty."
+msgstr "El ficheru dunviáu ta baleru."
+
+#: forms/fields.py:568
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+"Asegúrate qu'esti nome de ficheru tien polo menos %(max)d caráuter (tien "
+"%(length)d)."
+msgstr[1] ""
+"Asegúrate qu'esti nome de ficheru tien polo menos %(max)d caráuteres (tien "
+"%(length)d)."
+
+#: forms/fields.py:571
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr "Por favor, dunvia un ficheru o conseña la caxella , non dambos."
+
+#: forms/fields.py:632
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Xubi una imaxe válida. El ficheru que xubiesti o nun yera una imaxe, o taba "
+"toriada."
+
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+"Esbilla una escoyeta válida. %(value)s nun una ún de les escoyetes "
+"disponibles."
+
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
+msgid "Enter a list of values."
+msgstr "Introduz una llista valores."
+
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
+#. Translators: This is the default suffix added to form field labels
+#: forms/forms.py:122
+msgid ":"
+msgstr ":"
+
+#: forms/forms.py:192
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr "(Campu anubríu %(name)s) %(error)s"
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the
+#. label
+#: forms/forms.py:620
+msgid ":?.!"
+msgstr ":?.!"
+
+#: forms/formsets.py:95
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: forms/formsets.py:332
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] "Por favor, dunvia %d o menos formularios."
+msgstr[1] "Por favor, dunvia %d o menos formularios."
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
+msgid "Order"
+msgstr "Orde"
+
+#: forms/formsets.py:371
+msgid "Delete"
+msgstr "Desanciar"
+
+#: forms/models.py:712
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Por favor, igua'l datu duplicáu de %(field)s."
+
+#: forms/models.py:716
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+"Por favor, igua'l datu duplicáu pa %(field)s, el cual tien de ser únicu."
+
+#: forms/models.py:722
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"Por favor, igua'l datu duplicáu de %(field_name)s el cual tien de ser únicu "
+"pal %(lookup)s en %(date_field)s."
+
+#: forms/models.py:730
+msgid "Please correct the duplicate values below."
+msgstr "Por favor, igua los valores duplicaos embaxo"
+
+#: forms/models.py:1028
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+"La calve foriata en llinia nun concasa cola clave primaria d'instancia pá."
+
+#: forms/models.py:1094
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Esbilla una escoyeta válida. Esa escoyeta nun ye una de les escoyetes "
+"disponibles."
+
+#: forms/models.py:1194
+#, python-format
+msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgstr "\"%(pk)s\" nun ye un valor válidu pa la clave primaria."
+
+#: forms/models.py:1205
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr "Primi \"Control, o \"Comandu\" nun Mac, pa esbillar más d'ún."
+
+#: forms/utils.py:148
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"Nun pudo interpretase %(datetime)s nel fusu horariu %(current_timezone)s; "
+"pue ser ambiguu o pue nun esistir."
+
+#: forms/widgets.py:350
+msgid "Currently"
+msgstr "Anguaño"
+
+#: forms/widgets.py:351
+msgid "Change"
+msgstr "Camudar"
+
+#: forms/widgets.py:352
+msgid "Clear"
+msgstr "Llimpiar"
+
+#: forms/widgets.py:546
+msgid "Unknown"
+msgstr "Desconocíu"
+
+#: forms/widgets.py:547
+msgid "Yes"
+msgstr "Sí"
+
+#: forms/widgets.py:548
+msgid "No"
+msgstr "Non"
+
+#: template/defaultfilters.py:855
+msgid "yes,no,maybe"
+msgstr "sí,non,quiciabes"
+
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
+
+#: template/defaultfilters.py:898
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: template/defaultfilters.py:900
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#: template/defaultfilters.py:902
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#: template/defaultfilters.py:904
+#, python-format
+msgid "%s TB"
+msgstr "%s TB"
+
+#: template/defaultfilters.py:906
+#, python-format
+msgid "%s PB"
+msgstr "%s PB"
+
+#: utils/dateformat.py:59
+msgid "p.m."
+msgstr "p.m."
+
+#: utils/dateformat.py:60
+msgid "a.m."
+msgstr "a.m."
+
+#: utils/dateformat.py:65
+msgid "PM"
+msgstr "PM"
+
+#: utils/dateformat.py:66
+msgid "AM"
+msgstr "AM"
+
+#: utils/dateformat.py:149
+msgid "midnight"
+msgstr "Media nueche"
+
+#: utils/dateformat.py:151
+msgid "noon"
+msgstr "Meudía"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Llunes"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Martes"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Xueves"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Vienres"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Sábadu"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Domingu"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "LLu"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "Mar"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "Mie"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "Xue"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "Vie"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "Sáb"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "Dom"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "Xineru"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "Febreru"
+
+#: utils/dates.py:18
+msgid "March"
+msgstr "Marzu"
+
+#: utils/dates.py:18
+msgid "April"
+msgstr "Abril"
+
+#: utils/dates.py:18
+msgid "May"
+msgstr "Mayu"
+
+#: utils/dates.py:18
+msgid "June"
+msgstr "Xunu"
+
+#: utils/dates.py:19
+msgid "July"
+msgstr "Xunetu"
+
+#: utils/dates.py:19
+msgid "August"
+msgstr "Agostu"
+
+#: utils/dates.py:19
+msgid "September"
+msgstr "Setiembre"
+
+#: utils/dates.py:19
+msgid "October"
+msgstr "Ochobre"
+
+#: utils/dates.py:19
+msgid "November"
+msgstr "Payares"
+
+#: utils/dates.py:20
+msgid "December"
+msgstr "Avientu"
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr "xin"
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr "feb"
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr "mar"
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr "abr"
+
+#: utils/dates.py:23
+msgid "may"
+msgstr "may"
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr "xun"
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr "xnt"
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr "ago"
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr "set"
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr "och"
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr "pay"
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr "avi"
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr "Xin."
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr "Feb."
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "Mar."
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "Abr."
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "May."
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "Xun."
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "Xnt."
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr "Ago."
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr "Set."
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr "Och."
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "Pay."
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "Avi."
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr "Xineru"
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr "Febreru"
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr "Marzu"
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr "Abril"
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr "Mayu"
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr "Xunu"
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr "Xunetu"
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr "Agostu"
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr "Setiembre"
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr "Ochobre"
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr "Payares"
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr "Avientu"
+
+#: utils/ipv6.py:10
+msgid "This is not a valid IPv6 address."
+msgstr ""
+
+#: utils/text.py:76
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:245
+msgid "or"
+msgstr "o"
+
+#. Translators: This string is used as a separator between list elements
+#: utils/text.py:264 utils/timesince.py:57
+msgid ", "
+msgstr ", "
+
+#: utils/timesince.py:25
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d añu"
+msgstr[1] "%d años"
+
+#: utils/timesince.py:26
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d mes"
+msgstr[1] "%d meses"
+
+#: utils/timesince.py:27
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d selmana"
+msgstr[1] "%d selmanes"
+
+#: utils/timesince.py:28
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d día"
+msgstr[1] "%d díes"
+
+#: utils/timesince.py:29
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d hores"
+
+#: utils/timesince.py:30
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutu"
+msgstr[1] "%d minutos"
+
+#: utils/timesince.py:46
+msgid "0 minutes"
+msgstr "0 minutos"
+
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
+
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
+msgid "No year specified"
+msgstr "Nun s'especificó l'añu"
+
+#: views/generic/dates.py:99
+msgid "No month specified"
+msgstr "Nun s'especificó'l mes"
+
+#: views/generic/dates.py:158
+msgid "No day specified"
+msgstr "Nun s'especificó'l día"
+
+#: views/generic/dates.py:214
+msgid "No week specified"
+msgstr "Nun s'especificó la selmana"
+
+#: views/generic/dates.py:369 views/generic/dates.py:397
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Ensin %(verbose_name_plural)s disponible"
+
+#: views/generic/dates.py:650
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+"Nun ta disponible'l %(verbose_name_plural)s futuru porque %(class_name)s."
+"allow_future ye False."
+
+#: views/generic/dates.py:682
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr "Cadena de data inválida '%(datestr)s' col formatu dau '%(format)s'"
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Nun s'alcontró %(verbose_name)s que concase cola gueta"
+
+#: views/generic/list.py:62
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr "La páxina nun ye 'last', tampoco pue convertise a un int."
+
+#: views/generic/list.py:67
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Páxina inválida (%(page_number)s): %(message)s"
+
+#: views/generic/list.py:158
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr "La llista ta balera y '%(class_name)s.allow_empty' ye False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Nun tán almitíos equí los indexaos de direutoriu."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" nun esiste"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Índiz de %(directory)s"
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/az/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/az/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/az/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/az/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/az/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/az/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -4,10 +4,10 @@
# Metin Amiroff , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
"language/az/)\n"
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: az\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: conf/global_settings.py:51
msgid "Afrikaans"
@@ -26,6 +26,10 @@
msgstr "Ərəbcə"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azərbaycanca"
@@ -78,322 +82,350 @@
msgstr "İngiliscə"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Britaniya İngiliscəsi"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "İspanca"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Argentina İspancası"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Meksika İspancası"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Nikaraqua İspancası"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Venesuela İspancası"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estonca"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Baskca"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Farsca"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Fincə"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Fransızca"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Friscə"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "İrlandca"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Qallik dili"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "İbranicə"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindcə"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Xorvatca"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Macarca"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "İnterlinqua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "İndonezcə"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "İslandca"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "İtalyanca"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Yaponca"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Gürcücə"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Qazax"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Kxmercə"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannada dili"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Koreyca"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Lüksemburqca"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Litva dili"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Latviya dili"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Makedonca"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayamca"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Monqolca"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Bokmal Norveçcəsi"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepal"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Flamandca"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Nynorsk Norveçcəsi"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Pancabicə"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Polyakca"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portuqalca"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Braziliya Portuqalcası"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Rumınca"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Rusca"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slovakca"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Slovencə"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albanca"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbcə"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serbcə Latın"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "İsveçcə"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Suahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamilcə"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Teluqu dili"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Tayca"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Türkcə"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatar"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Udmurtca"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ukraynaca"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urduca"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vyetnamca"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Sadələşdirilmiş Çincə"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Ənənəvi Çincə"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Düzgün qiymət daxil edin."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Düzgün URL daxil edin."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Düzgün e-poçt ünvanını daxil edin."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Hərflərdən, rəqəmlərdən, alt-xətlərdən və ya defislərdən ibarət düzgün slaq "
"daxil edin."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Düzgün IPv4 ünvanı daxil edin."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Düzgün IPv6 ünvanını daxil edin."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Düzgün IPv4 və ya IPv6 ünvanını daxil edin."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Vergüllə ayırmaqla yalnız rəqəmlər daxil edin."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Əmin edin ki, bu qiymət %(limit_value)s-dir (bu %(show_value)s-dir)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Bu qiymətin %(limit_value)s-ya bərabər və ya ondan kiçik olduğunu yoxlayın."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Bu qiymətin %(limit_value)s-ya bərabər və ya ondan böyük olduğunu yoxlayın."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -402,8 +434,9 @@
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -412,290 +445,303 @@
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s %(date_field)s %(lookup)s tarixinə görə özəl olmalıdır."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "və"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s bu %(field_label)s sahə ilə artıq mövcuddur."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Bu sahə boş qala bilməz."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Bu sahə ağ qala bilməz."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s bu %(field_label)s sahə ilə artıq mövcuddur."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Sahənin tipi: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Tam ədəd"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Bul (ya Doğru, ya Yalan)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Sətir (%(max_length)s simvola kimi)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Vergüllə ayrılmış tam ədədlər"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Tarix (saatsız)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Tarix (vaxt ilə)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Rasional ədəd"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "E-poçt"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Faylın ünvanı"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Sürüşən vergüllü ədəd"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Böyük (8 bayt) tam ədəd"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 ünvanı"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP ünvan"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Bul (Ya Doğru, ya Yalan, ya da Heç nə)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Müsbət tam ədəd"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Müsbət tam kiçik ədəd"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Əzmə (%(max_length)s simvola kimi)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Kiçik tam ədəd"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Mətn"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Vaxt"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Fayl"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Şəkil"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Xarici açar (bağlı olduğu sahəyə uyğun tipi alır)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Birin-birə münasibət"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Çoxun-çoxa münasibət"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Bu sahə vacibdir."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Tam ədəd daxil edin."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Ədəd daxil edin."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
+msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
+msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
msgid_plural ""
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] ""
+msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Düzgün tarix daxil edin."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Düzgün vaxt daxil edin."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Düzgün tarix/vaxt daxil edin."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Fayl göndərilməyib. Vərəqənin (\"form\") şifrələmə tipini yoxlayın."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Fayl göndərilməyib."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Göndərilən fayl boşdur."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr[0] ""
+msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Ya fayl göndərin, ya da xanaya quş qoymayın, hər ikisini də birdən etməyin."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -703,21 +749,25 @@
"Düzgün şəkil göndərin. Göndərdiyiniz fayl ya şəkil deyil, ya da şəkildə "
"problem var."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Düzgün seçim edin. %(value)s seçimlər arasında yoxdur."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Qiymətlərin siyahısını daxil edin."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -725,41 +775,49 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
+msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Sırala"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Sil"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s sahəsinə görə təkrarlanan məlumatlara düzəliş edin."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"%(field)s sahəsinə görə təkrarlanan məlumatlara düzəliş edin, onların hamısı "
"fərqli olmalıdır."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -768,31 +826,31 @@
"%(field_name)s sahəsinə görə təkrarlanan məlumatlara düzəliş edin, onlar "
"%(date_field)s %(lookup)s-a görə fərqli olmalıdır."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Aşağıda təkrarlanan qiymətlərə düzəliş edin."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Xarici açar ana obyektin əsas açarı ilə üst-üstə düşmür."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Düzgün seçim edin. Bu seçim mümkün deyil."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Birdən artıq seçim etmək istəyirsinizsə, \"Control\" düyməsini basılı "
"saxlayın, Mac istifadəçiləri üçün \"Command\""
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -801,15 +859,15 @@
"%(datetime)s %(current_timezone)s zaman qurşağında ifadə oluna bilmir; ya "
"duallıq, ya da yanlışlıq var."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Hal-hazırda"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Dəyiş"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Təmizlə"
@@ -825,62 +883,63 @@
msgid "No"
msgstr "Yox"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "hə, yox, bəlkə"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d bayt"
+msgstr[0] ""
+msgstr[1] ""
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "gecə yarısı"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "günorta"
@@ -1156,111 +1215,133 @@
msgid "December"
msgstr "Dekabr"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "və ya"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
+msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
+msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
+msgstr[1] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
+msgstr[1] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
+msgstr[1] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
+msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Ünvan indekslərinə icazə verilmir."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" mövcud deyil"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "%(directory)s-nin indeksi"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "İl göstərilməyib"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Ay göstərilməyib"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Gün göstərilməyib"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Həftə göstərilməyib"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s seçmək mümkün deyil"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1269,7 +1350,7 @@
"Gələcək %(verbose_name_plural)s seçmək mümkün deyil, çünki %(class_name)s."
"allow_future Yalan kimi qeyd olunub."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "\"%(format)s\" formatına görə \"%(datestr)s\" tarixi düzgün deyil"
@@ -1279,16 +1360,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Sorğuya uyğun %(verbose_name)s tapılmadı"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Səhifə nə \"axırıncı\"dır, nə də tam ədədə çevirmək mümkündür."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Qeyri-düzgün səhifə (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Siyahı boşdur və '%(class_name)s.allow_empty' Yalan kimi qeyd olunub."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Ünvan indekslərinə icazə verilmir."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" mövcud deyil"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s-nin indeksi"
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/be/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/be/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/be/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/be/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/be/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/be/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -3,10 +3,10 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
"language/be/)\n"
@@ -26,6 +26,10 @@
msgstr "Арабская"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Азэрбайджанская"
@@ -78,320 +82,348 @@
msgstr "Анґельская"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Анґельская (Брытанская)"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Эспэранта"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Гішпанская"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Гішпанская (Арґентына)"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Гішпанская (Мэксыка)"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Гішпанская (Нікараґуа)"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Эстонская"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Басконская"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Фарсі"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Фінская"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Француская"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Фрызкая"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Ірляндзкая"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Ґальская"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Габрэйская"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Гінды"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Харвацкая"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Вугорская"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Інданэзійская"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Ісьляндзкая"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Італьянская"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Японская"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Грузінская"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Казаская"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Кхмерская"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Каннада"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Карэйская"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Літоўская"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Латыская"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Македонская"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Малаялам"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Манґольская"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Нарвэская букмол"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Нэпальская"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Галяндзкая"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Нарвэская нюнорск"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Панджабі"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Польская"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Партуґальская"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Партуґальская (Бразылія)"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Румынская"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Расейская"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Славацкая"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Славенская"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Альбанская"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Сэрбская"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Сэрбская (лацінка)"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Швэдзкая"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Суахілі"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Тамільская"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Тэлуґу"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Тайская"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Турэцкая"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Татарская"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Украінская"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Урду"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Віетнамская"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Кітайская (спрошчаная)"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Кітайская (звычайная)"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Пазначце правільнае значэньне."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Пазначце чынную спасылку."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "Бірка можа зьмяшчаць літары, лічбы, знакі падкрэсьліваньня ды злучкі."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Пазначце чынны адрас IPv4."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Пазначце чынны адрас IPv6."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Пазначце чынны адрас IPv4 або IPv6."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Набярыце лічбы, падзеленыя коскамі."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Упэўніцеся, што гэтае значэньне — %(limit_value)s (зараз яно — "
"%(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Значэньне мусіць быць меншым або роўным %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Значэньне мусіць быць большым або роўным %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -404,7 +436,7 @@
msgstr[2] ""
msgstr[3] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -417,235 +449,241 @@
msgstr[2] ""
msgstr[3] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"Значэньне «%(field_name)s мусіць быць непаўторным для «%(lookup)s» у полі "
-"«%(date_field)s»."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "і"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s з такім %(field_label)s ужо існуе."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Поле ня можа мець значэньне «null»."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Трэба запоўніць поле."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s з такім %(field_label)s ужо існуе."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Палі віду: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Цэлы лік"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Ляґічнае («сапраўдна» або «не сапраўдна»)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Радок (ня болей за %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Цэлыя лікі, падзеленыя коскаю"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Дата (бяз часу)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Дата (разам з часам)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Дзесятковы лік"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Адрас эл. пошты"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Шлях да файла"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Лік зь пераноснай коскаю"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Вялікі (8 байтаў) цэлы"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Адрас IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Адрас IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Ляґічнае («сапраўдна», «не сапраўдна» ці «нічога»)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Дадатны цэлы лік"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Дадатны малы цэлы лік"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Бірка (ня болей за %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Малы цэлы лік"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Тэкст"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Час"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "Сеціўная спасылка"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Файл"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Выява"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Вонкавы ключ (від вызначаецца паводле зьвязанага поля)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Сувязь «адзін да аднаго»"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Сувязь «некалькі да некалькіх»"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Поле трэба запоўніць."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Набярыце ўвесь лік."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Набярыце лік."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
@@ -654,7 +692,7 @@
msgstr[2] ""
msgstr[3] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
@@ -663,7 +701,7 @@
msgstr[2] ""
msgstr[3] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -674,31 +712,31 @@
msgstr[2] ""
msgstr[3] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Пазначце чынную дату."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Пазначце чынны час."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Пазначце чынныя час і дату."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Файл не даслалі. Зірніце кадоўку блянку."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Файл не даслалі."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Дасланы файл — парожні."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -708,34 +746,38 @@
msgstr[2] ""
msgstr[3] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Трэба або даслаць файл, або абраць «Ачысьціць», але нельга рабіць гэта "
"адначасова."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
"Запампаваць чынны малюнак. Запампавалі або не выяву, або пашкоджаную выяву."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Абярыце дазволенае. %(value)s няма ў даступных значэньнях."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Упішыце сьпіс значэньняў."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -743,15 +785,15 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
@@ -760,25 +802,34 @@
msgstr[2] ""
msgstr[3] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Парадак"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Выдаліць"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "У полі «%(field)s» выпраўце зьвесткі, якія паўтараюцца."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Выпраўце зьвесткі ў полі «%(field)s»: нельга, каб яны паўтараліся."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -787,29 +838,29 @@
"Выпраўце зьвесткі ў полі «%(field_name)s»: нельга каб зьвесткі ў "
"«%(date_field)s» для «%(lookup)s» паўтараліся."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Выпраўце зьвесткі, якія паўтараюцца (гл. ніжэй)."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Вонкавы ключ не супадае з бацькоўскім першасным ключом."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Абярыце дазволенае. Абранага няма ў даступных значэньнях."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Каб абраць некалькі пунктаў, трымайце «Ctrl» (на «Маках» — «Command»)."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -818,15 +869,15 @@
"У часавым абсягу «%(current_timezone)s» нельга зразумець дату %(datetime)s: "
"яна можа быць неадназначнаю або яе можа не існаваць."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Зараз"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Зьмяніць"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Ачысьціць"
@@ -842,11 +893,11 @@
msgid "No"
msgstr "Не"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "так,не,магчыма"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -855,52 +906,52 @@
msgstr[2] "%(size)d байтаў"
msgstr[3] "%(size)d байтаў"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s КБ"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s МБ"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s ҐБ"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s ТБ"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s ПБ"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "папаўдні"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "папоўначы"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "папаўдні"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "папоўначы"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "поўнач"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "поўдзень"
@@ -1176,36 +1227,26 @@
msgid "December"
msgstr "сьнежня"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s…"
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "або"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
@@ -1214,7 +1255,7 @@
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
@@ -1223,7 +1264,7 @@
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -1232,7 +1273,7 @@
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
@@ -1241,7 +1282,7 @@
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -1250,7 +1291,7 @@
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -1259,46 +1300,72 @@
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Не дазваляецца глядзець сьпіс файлаў каталёґа."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "Шлях «%(path)s» не існуе."
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Файлы каталёґа «%(directory)s»"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Не пазначылі год"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Не пазначылі месяц"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Не пазначылі дзень"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Не пазначылі тыдзень"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Няма доступу да %(verbose_name_plural)s"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1307,7 +1374,7 @@
"Няма доступу да %(verbose_name_plural)s, якія будуць, бо «%(class_name)s."
"allow_future» мае значэньне «не сапраўдна»."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Радок даты «%(datestr)s» не адпавядае выгляду «%(format)s»"
@@ -1317,19 +1384,33 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Па запыце не знайшлі ніводнага %(verbose_name)s"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Нумар бачыны ня мае значэньня «last» і яго нельга ператварыць у цэлы лік."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
"Сьпіс парожні, але «%(class_name)s.allow_empty» мае значэньне «не "
"сапраўдна», што забараняе паказваць парожнія сьпісы."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Не дазваляецца глядзець сьпіс файлаў каталёґа."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "Шлях «%(path)s» не існуе."
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Файлы каталёґа «%(directory)s»"
diff -Nru python-django-1.6.6/django/conf/locale/bg/formats.py python-django-1.7.4/django/conf/locale/bg/formats.py
--- python-django-1.6.6/django/conf/locale/bg/formats.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/bg/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -7,18 +7,18 @@
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'd F Y'
TIME_FORMAT = 'H:i:s'
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'd.m.Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = ' ' # Non-breaking space
-# NUMBER_GROUPING =
+THOUSAND_SEPARATOR = ' ' # Non-breaking space
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/bg/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/bg/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/bg/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/bg/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/bg/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/bg/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -3,15 +3,17 @@
# Translators:
# Boris Chervenkov , 2012
# Jannis Leidel , 2011
-# Todor Lube , 2013
-# zaxl , 2012
+# Lyuboslav Petrov , 2014
+# Todor Lubenov , 2013
+# vestimir , 2014
+# Alexander Atanasov , 2012
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
-"Last-Translator: Jannis Leidel \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-28 20:15+0000\n"
+"Last-Translator: vestimir \n"
"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
"language/bg/)\n"
"MIME-Version: 1.0\n"
@@ -29,6 +31,10 @@
msgstr "арабски език"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Азербайджански език"
@@ -81,320 +87,348 @@
msgstr "английски език"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "британски английски"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Есперанто"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "испански език"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "кастилски"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Мексикански испански"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "никарагуански испански"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Испански Венецуелски"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "естонски език"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "баски"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "персийски език"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "финландски език"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "френски език"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "фризийски език"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "ирландски език"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "галицейски език"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "иврит"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "хинди"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "хърватски език"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "унгарски език"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Международен"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "индонезийски език"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "исландски език"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "италиански език"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "японски език"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "грузински език"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Казахски"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "кхмерски език"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "каннада"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "корейски език"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Люксембургски"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "литовски език"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "латвийски език"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "македонски език"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "малаялам"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "монголски език"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "Бурмесе"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "норвежки букмол"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Непалски"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "холандски"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "норвежки съвременен език"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "Осетски"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "пенджаби"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "полски език"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "португалски език"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "бразилски португалски"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "румънски език"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "руски език"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "словашки език"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "словенски език"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "албански език"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "сръбски език"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "сръбски с латински букви"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "шведски език"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Суахили"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "тамил"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "телугу"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "тайландски език"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "турски език"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Татарски"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Удмурт"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "украински език"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Урду"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "виетнамски език"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "китайски език"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "традиционен китайски"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Въведете валидна стойност. "
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Въведете валиден URL адрес."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr ""
+msgstr "Въведете валидно число."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Въведете валиден имейл адрес."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Въведете валиден 'слъг', състоящ се от букви, цифри, тирета или долни тирета."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Въведете валиден IPv4 адрес."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Въведете валиден IPv6 адрес."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Въведете валиден IPv4 или IPv6 адрес."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Въведете само еднозначни числа, разделени със запетая. "
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Уверете се, че тази стойност е %(limit_value)s (тя е %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Уверете се, че тази стойност е по-малка или равна на %(limit_value)s ."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Уверете се, че тази стойност е по-голяма или равна на %(limit_value)s ."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -403,9 +437,13 @@
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Уверете се, тази стойност е най-малко %(limit_value)d знака (тя има "
+"%(show_value)d )."
msgstr[1] ""
+"Уверете се, тази стойност е най-малко %(limit_value)d знака (тя има "
+"%(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -414,295 +452,312 @@
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Уверете се, тази стойност има най-много %(limit_value)d знака (тя има "
+"%(show_value)d)."
msgstr[1] ""
+"Уверете се, тази стойност има най-много %(limit_value)d знака (тя има "
+"%(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s трябва да са уникални за %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "и"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s с този %(field_label)s вече съществува."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Това поле не може да има празна стойност."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Това поле не може да е празно."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s с този %(field_label)s вече съществува."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Поле от тип: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Цяло число"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boolean (True или False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Символен низ (до %(max_length)s символа)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Цели числа, разделени с запетая"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Дата (без час)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Дата (и час)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Десетична дроб"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Email адрес"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Път към файл"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Число с плаваща запетая"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Голямо (8 байта) цяло число"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 адрес"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP адрес"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (Възможните стойности са True, False или None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Положително цяло число"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Положително 2 байта цяло число"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (до %(max_length)s )"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "2 байта цяло число"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Текст"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Време"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL адрес"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "сурови двоични данни"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Файл"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Изображение"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Външен ключ (тип, определен от свързаното поле)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "словенски език"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Много-към-много връзка"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Това поле е задължително."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Въведете цяло число. "
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Въведете число."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Уверете се, че има не повече от %(max)s цифри в общо."
+msgstr[1] "Уверете се, че има не повече от %(max)s цифри общо."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
+"Уверете се, че има не повече от%(max)s знак след десетичната запетая."
msgstr[1] ""
+"Уверете се, че има не повече от %(max)s знака след десетичната запетая."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
msgid_plural ""
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] ""
+"Уверете се, че има не повече от %(max)s цифри преди десетичната запетая."
msgstr[1] ""
+"Уверете се, че има не повече от %(max)s цифри преди десетичната запетая."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Въведете валидна дата. "
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Въведете валиден час."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Въведете валидна дата/час. "
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Не е получен файл. Проверете типа кодиране на формата. "
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Няма изпратен файл."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Каченият файл е празен. "
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr[0] ""
+msgstr[0] "Уверете се, това име е най-много %(max)d знака (то има %(length)d)."
msgstr[1] ""
+"Уверете се, това файлово име има най-много %(max)d знаци (има %(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Моля, или пратете файл или маркирайте полето за изчистване, но не и двете."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -710,21 +765,25 @@
"Качете валидно изображение. Файлът, който сте качили или не е изображение, "
"или е повреден. "
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Направете валиден избор. %(value)s не е един от възможните избори."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Въведете списък от стойности"
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
-msgstr ""
+msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(Скрито поле %(name)s) %(error)s"
@@ -732,42 +791,49 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
-msgstr ""
+msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
+msgstr[0] "Моля, въведете %d по-малко форми."
+msgstr[1] "Моля, въведете %d по-малко форми."
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ред"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Изтрий"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Моля, коригирайте дублираните данни за %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Моля, коригирайте дублираните данни за %(field)s, които трябва да са "
"уникални."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -776,31 +842,31 @@
"Моля, коригирайте дублиранитe данни за %(field_name)s , които трябва да са "
"уникални за %(lookup)s в %(date_field)s ."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Моля, коригирайте повтарящите се стойности по-долу."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Невалидна избрана стойност."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Направете валиден избор. Този не е един от възможните избори. "
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" не е валидна стойност за първичен ключ."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Задръжте натиснат клавиша \"Control\" (или \"Command\" на Mac), за да "
"направите повече от един избор. "
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -809,15 +875,15 @@
"%(datetime)s не може да бъде разчетено в %(current_timezone)s; може да е "
"двусмислен или да не съществува"
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Сега"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Промени"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Изчисти"
@@ -833,63 +899,63 @@
msgid "No"
msgstr "Не"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "да, не, може би"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d, байт"
msgstr[1] "%(size)d, байта"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s ТБ"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "след обяд"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "преди обяд"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "след обяд"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "преди обяд"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "полунощ"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "обяд"
@@ -1165,117 +1231,133 @@
msgid "December"
msgstr "Декември"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "Нито Pillow нито PIL могат да се импортират: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr ""
+msgstr "Въведете валиден IPv6 адрес."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "или"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ","
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d година"
+msgstr[1] "%d години"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d месец"
+msgstr[1] "%d месеца"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d седмица"
+msgstr[1] "%d седмици"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d дни"
+msgstr[1] "%d дни"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d час"
+msgstr[1] "%d часа"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d минута"
+msgstr[1] "%d минути"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 минути"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Тук не е позволено индексиране на директория."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" не съществува"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Индекс %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Не е посочена година"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Не е посочен месец"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "ноев"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Не е посочена седмица"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Няма достъпни %(verbose_name_plural)s"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1284,7 +1366,7 @@
"Бъдещo %(verbose_name_plural)s е достъпно, тъй като %(class_name)s."
"allow_future е False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Невалидна дата '%(datestr)s' посочен формат '%(format)s'"
@@ -1294,16 +1376,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Няма %(verbose_name)s , съвпадащи със заявката"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Страницата не е 'last' нито може да се преобразува в int."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Невалидна страница (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Празен списък и '%(class_name)s.allow_empty' не е валидно."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Тук не е позволено индексиране на директория."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" не съществува"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Индекс %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/bn/formats.py python-django-1.7.4/django/conf/locale/bn/formats.py
--- python-django-1.6.6/django/conf/locale/bn/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/bn/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -7,18 +7,18 @@
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'j F, Y'
TIME_FORMAT = 'g:i:s A'
-# DATETIME_FORMAT =
+# DATETIME_FORMAT =
YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'j M, Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/bn/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/bn/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/bn/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/bn/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/bn/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/bn/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -7,10 +7,10 @@
# Tahmid Rafi , 2013
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
"bn/)\n"
@@ -29,6 +29,10 @@
msgstr "আরবী"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "আজারবাইজানি"
@@ -81,320 +85,348 @@
msgstr "ইংলিশ"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "বৃটিশ ইংলিশ"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "আন্তর্জাতিক ভাষা"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "স্প্যানিশ"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "আর্জেন্টিনিয়ান স্প্যানিশ"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "মেক্সিকান স্প্যানিশ"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "নিকারাগুয়ান স্প্যানিশ"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "ভেনেজুয়েলার স্প্যানিশ"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "এস্তোনিয়ান"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "বাস্ক"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "ফারসি"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "ফিনিশ"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "ফ্রেঞ্চ"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "ফ্রিজ্ল্যানডের ভাষা"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "আইরিশ"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "গ্যালিসিয়ান"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "হিব্রু"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "হিন্দী"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "ক্রোয়েশিয়ান"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "হাঙ্গেরিয়ান"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "ইন্দোনেশিয়ান"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "আইসল্যান্ডিক"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "ইটালিয়ান"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "জাপানিজ"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "জর্জিয়ান"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "কাজাখ"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "খমার"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "কান্নাড়া"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "কোরিয়ান"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "লুক্সেমবার্গীয়"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "লিথুয়ানিয়ান"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "লাটভিয়ান"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "ম্যাসাডোনিয়ান"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "মালায়ালম"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "মঙ্গোলিয়ান"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "বার্মিজ"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "নরওয়েজীয় বোকমাল"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "নেপালি"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "ডাচ"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "নরওয়েজীয়ান নিনর্স্ক"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "অসেটিক"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "পাঞ্জাবী"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "পোলিশ"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "পর্তুগীজ"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "ব্রাজিলিয়ান পর্তুগীজ"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "রোমানিয়ান"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "রাশান"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "স্লোভাক"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "স্লোভেনিয়ান"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "আলবেনীয়ান"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "সার্বিয়ান"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "সার্বিয়ান ল্যাটিন"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "সুইডিশ"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "সোয়াহিলি"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "তামিল"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "তেলেগু"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "থাই"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "তুর্কি"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "তাতারদেশীয়"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ইউক্রেনিয়ান"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "উর্দু"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "ভিয়েতনামিজ"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "সরলীকৃত চাইনীজ"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "প্রচলিত চাইনীজ"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "একটি বৈধ মান দিন।"
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "বৈধ URL দিন"
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "একটি বৈধ ইমেইল ঠিকানা লিখুন."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"বৈধ ’slug' প্রবেশ করান যাতে শুধুমাত্র ইংরেজী বর্ণ, অঙ্ক, আন্ডারস্কোর অথবা হাইফেন "
"রয়েছে।"
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "একটি বৈধ IPv4 ঠিকানা দিন।"
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "একটি বৈধ IPv6 ঠিকানা টাইপ করুন।"
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "একটি বৈধ IPv4 অথবা IPv6 ঠিকানা টাইপ করুন।"
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "শুধুমাত্র কমা দিয়ে সংখ্যা দিন।"
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "সংখ্যাটির মান %(limit_value)s হতে হবে (এটা এখন %(show_value)s আছে)।"
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "সংখ্যাটির মান %(limit_value)s এর চেয়ে ছোট বা সমান হতে হবে।"
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "সংখ্যাটির মান %(limit_value)s এর চেয়ে বড় বা সমান হতে হবে।"
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -405,7 +437,7 @@
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -416,247 +448,255 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "এবং"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(field_label)s সহ %(model_name)s আরেকটি রয়েছে।"
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "এর মান null হতে পারবে না।"
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "এই ফিল্ডের মান ফাঁকা হতে পারে না"
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(field_label)s সহ %(model_name)s আরেকটি রয়েছে।"
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "ফিল্ডের ধরণ: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "ইন্টিজার"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "বুলিয়ান (হয় True অথবা False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "স্ট্রিং (সর্বোচ্চ %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "কমা দিয়ে আলাদা করা ইন্টিজার"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "তারিখ (সময় বাদে)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "তারিখ (সময় সহ)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "দশমিক সংখ্যা"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "ইমেইল ঠিকানা"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "ফাইল পথ"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "ফ্লোটিং পয়েন্ট সংখ্যা"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "বিগ (৮ বাইট) ইন্টিজার"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 ঠিকানা"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "আইপি ঠিকানা"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "বুলিয়ান (হয় True, False অথবা None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "পজিটিভ ইন্টিজার"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "পজিটিভ স্মল ইন্টিজার"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "স্লাগ (সর্বোচ্চ %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "স্মল ইন্টিজার"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "টেক্সট"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "সময়"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "ইউআরএল (URL)"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "র বাইনারি ডাটা"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "ফাইল"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "ইমেজ"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "ফরেন কি (টাইপ রিলেটেড ফিল্ড দ্বারা নির্ণীত হবে)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "ওয়ান-টু-ওয়ান রিলেশানশিপ"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "ম্যানি-টু-ম্যানি রিলেশানশিপ"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "এটি আবশ্যক।"
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "একটি পূর্ণসংখ্যা দিন"
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "একটি সংখ্যা প্রবেশ করান।"
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -665,31 +705,31 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "বৈধ তারিখ দিন।"
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "বৈধ সময় দিন।"
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "বৈধ তারিখ/সময় দিন।"
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "কোন ফাইল দেয়া হয়নি। ফর্মের এনকোডিং ঠিক আছে কিনা দেখুন।"
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "কোন ফাইল দেয়া হয়নি।"
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "ফাইলটি খালি।"
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -697,12 +737,12 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"একটি ফাইল সাবমিট করুন অথবা ক্লিয়ার চেকবক্সটি চেক করে দিন, যে কোন একটি করুন।"
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -710,21 +750,25 @@
"সঠিক ছবি আপলোড করুন। যে ফাইলটি আপলোড করা হয়েছে তা হয় ছবি নয় অথবা নষ্ট হয়ে "
"যাওয়া ছবি।"
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "%(value)s বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "কয়েকটি মানের তালিকা দিন।"
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -732,84 +776,91 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "ক্রম"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "মুছুন"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "ইনলাইন ফরেন কি টি প্যারেন্ট ইনস্ট্যান্সের প্রাইমারি কি এর সমান নয়।"
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "এটি বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "একাধিক বাছাই করতে \"কন্ট্রোল\", অথবা ম্যাকে \"কমান্ড\", চেপে ধরুন।"
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "এই মুহুর্তে"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "পরিবর্তন"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "পরিষ্কার করুন"
@@ -825,63 +876,63 @@
msgid "No"
msgstr "না"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "হ্যাঁ,না,হয়তো"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d বাইট"
msgstr[1] "%(size)d বাইট"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s কিলোবাইট"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s মেগাবাইট"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s গিগাবাইট"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s টেরাবাইট"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s পেটাবাইট"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "অপরাহ্ন"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "পূর্বাহ্ন"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "অপরাহ্ন"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "পূর্বাহ্ন"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "মধ্যরাত"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "দুপুর"
@@ -1157,124 +1208,140 @@
msgid "December"
msgstr "ডিসেম্বর"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "অথবা"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ","
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 মিনিট"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "ডিরেক্টরি ইনডেক্স অনুমোদিত নয়"
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" এর অস্তিত্ব নেই"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "%(directory)s এর ইনডেক্স"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "কোন বছর উল্লেখ করা হয়নি"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "কোন মাস উল্লেখ করা হয়নি"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "কোন দিন উল্লেখ করা হয়নি"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "কোন সপ্তাহ উল্লেখ করা হয়নি"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "কোন %(verbose_name_plural)s নেই"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1284,16 +1351,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "কুয়েরি ম্যাচ করে এমন কোন %(verbose_name)s পাওয়া যায় নি"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "ডিরেক্টরি ইনডেক্স অনুমোদিত নয়"
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" এর অস্তিত্ব নেই"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s এর ইনডেক্স"
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/br/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/br/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/br/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/br/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/br/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/br/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -4,10 +4,10 @@
# Fulup , 2012
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
"br/)\n"
@@ -26,6 +26,10 @@
msgstr "Arabeg"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azeri"
@@ -78,322 +82,350 @@
msgstr "Saozneg"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Saozneg Breizh-Veur"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanteg"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Spagnoleg"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Spagnoleg Arc'hantina"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Spagnoleg Mec'hiko"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Spagnoleg Nicaragua"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estoneg"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Euskareg"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Perseg"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finneg"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Galleg"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frizeg"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Iwerzhoneg"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galizeg"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebraeg"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Kroateg"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Hungareg"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonezeg"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Islandeg"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Italianeg"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japaneg"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Jorjianeg"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "kazak"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannata"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Koreaneg"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Lituaneg"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Latveg"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Makedoneg"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongoleg"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Norvegeg Bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "nepaleg"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Nederlandeg"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Norvegeg Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Punjabeg"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Poloneg"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugaleg"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Portugaleg Brazil"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Roumaneg"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Rusianeg"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slovakeg"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Sloveneg"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albaneg"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbeg"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serbeg e lizherennoù latin"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Svedeg"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "swahileg"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamileg"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telougou"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turkeg"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "tatar"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ukraineg"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Ourdou"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vietnameg"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Sinaeg eeunaet"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Sinaeg hengounel"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Merkit un talvoud reizh"
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Merkit un URL reizh"
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"N'hall bezañ er vaezienn-mañ nemet lizherennoù, niveroù, tiredoù izel _ ha "
"barrennigoù-stagañ."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Merkit ur chomlec'h IPv4 reizh."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Merkit ur chomlec'h IPv6 reizh."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Merkit ur chomlec'h IPv4 pe IPv6 reizh."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Merkañ hepken sifroù dispartiet dre skejoù."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Bezit sur ez eo an talvoud-mañ %(limit_value)s (evit ar mare ez eo "
"%(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Gwiriit mat emañ an talvoud-mañ a-is pe par da %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Gwiriit mat emañ an talvoud-mañ a-us pe par da %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -404,7 +436,7 @@
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -415,249 +447,255 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"Ret eo da %(field_name)s bezañ e-unan evit al lodenn %(date_field)s "
-"%(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "ha"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Bez' ez eus c'hoazh eus ur %(model_name)s gant ar %(field_label)s-mañ."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "N'hall ket ar vaezienn chom goullo"
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "N'hall ket ar vaezienn chom goullo"
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Bez' ez eus c'hoazh eus ur %(model_name)s gant ar %(field_label)s-mañ."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Seurt maezienn : %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Anterin"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boulean (gwir pe gaou)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "neudennad arouezennoù (betek %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Niveroù anterin dispartiet dre ur skej"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Deizad (hep eur)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Deizad (gant an eur)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Niver dekvedennel"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Chomlec'h postel"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Treug war-du ar restr"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Niver gant skej nij"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Anterin bras (8 okted)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Chomlec'h IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Chomlec'h IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boulean (gwir pe gaou pe netra)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Niver anterin pozitivel"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Niver anterin bihan pozitivel"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (betek %(max_length)s arouez.)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Niver anterin bihan"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Testenn"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Eur"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Restr"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Skeudenn"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Alc'hwez estren (seurt termenet dre ar vaezienn liammet)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Darempred unan-ouzh-unan"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Darempred lies-ouzh-lies"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Rekis eo leuniañ ar vaezienn."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Merkit un niver anterin."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Merkit un niver."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -666,31 +704,31 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Merkit un deiziad reizh"
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Merkit un eur reizh"
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Merkit un eur/deiziad reizh"
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "N'eus ket kaset restr ebet. Gwiriit ar seurt enkodañ evit ar restr"
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "N'eus bet kaset restr ebet."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Goullo eo ar restr kaset."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -698,11 +736,11 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Kasit ur restr pe askit al log riñsañ; an eil pe egile"
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -710,21 +748,25 @@
"Enpozhiit ur skeudenn reizh. Ar seurt bet enporzhiet ganeoc'h a oa foeltret "
"pe ne oa ket ur skeudenn"
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Dizuit un dibab reizh. %(value)s n'emañ ket e-touez an dibaboù posupl."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Merkit ur roll talvoudoù"
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -732,42 +774,49 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Urzh"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Diverkañ"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Reizhit ar roadennoù e doubl e %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Reizhit ar roadennoù e doubl e %(field)s, na zle bezañ enni nemet talvoudoù "
"dzho o-unan."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -776,31 +825,31 @@
"Reizhit ar roadennoù e doubl e %(field_name)s a rank bezañ ennañ talvodoù en "
"o-unan evit lodenn %(lookup)s %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Reizhañ ar roadennoù e doubl zo a-is"
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Ne glot ket an alc'hwez estren enlinenn gant alc'hwez-mamm an urzhiataer "
"galloudel kar"
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Diuzit un dibab reizh. N'emañ ket an dibab-mañ e-touez ar re bosupl."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Dalc'hit da bouezañ \"Ktrl\" pe \"Urzhiad\" (stokell Aval) war ur Mac."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -809,15 +858,15 @@
"N'eo ket bete komprenet an talvoud %(datetime)s er werzhid eur "
"%(current_timezone)s; pe eo amjestr pe n'eus ket anezhañ."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Evit ar mare"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Kemmañ"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Riñsañ"
@@ -833,63 +882,63 @@
msgid "No"
msgstr "Ket"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "ya, ket, marteze"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d okted"
msgstr[1] "%(size)d okted"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "g.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "mintin"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "G.M."
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "Mintin"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "hanternoz"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "kreisteiz"
@@ -1165,117 +1214,133 @@
msgid "December"
msgstr "Kerzu"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "pe"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ","
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "N'haller ket diskwel endalc'had ar c'havlec'h-mañ."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "N'eus ket eus \"%(path)s\""
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Meneger %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "N'eus bet resisaet bloavezh ebet"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "N'eus bet resisaet miz ebet"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "N'eus bet resisaet deiz ebet"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "N'eus bet resisaet sizhun ebet"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "N'eus %(verbose_name_plural)s ebet da gaout."
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1284,7 +1349,7 @@
"En dazont ne vo ket a %(verbose_name_plural)s rak faos eo %(class_name)s."
"allow_future."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1296,17 +1361,31 @@
msgstr ""
"N'eus bet kavet traezenn %(verbose_name)s ebet o klotaén gant ar goulenn"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"N'eo ket 'last' ar bajenn na n'hall ket bezañ amdroet en un niver anterin."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Roll goullo ha faos eo '%(class_name)s.allow_empty'."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "N'haller ket diskwel endalc'had ar c'havlec'h-mañ."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "N'eus ket eus \"%(path)s\""
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Meneger %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/bs/formats.py python-django-1.7.4/django/conf/locale/bs/formats.py
--- python-django-1.6.6/django/conf/locale/bs/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/bs/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -11,14 +11,14 @@
YEAR_MONTH_FORMAT = 'F Y.'
MONTH_DAY_FORMAT = 'j. F'
SHORT_DATE_FORMAT = 'Y M j'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/bs/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/bs/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/bs/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/bs/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/bs/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/bs/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -5,10 +5,10 @@
# Jannis Leidel , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:51+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
"bs/)\n"
@@ -28,6 +28,10 @@
msgstr "arapski"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azerbejdžanski"
@@ -80,322 +84,350 @@
msgstr "engleski"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Britanski engleski"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "španski"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Argentinski španski"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Meksički španski"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Nikuaraganski španski"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "estonski"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "baskijski"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "persijski"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "finski"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "francuski"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "frišanski"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "irski"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "galski"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "hebrejski"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "hrvatski"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "mađarski"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonežanski"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "islandski"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "italijanski"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "japanski"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "gruzijski"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "kambođanski"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "kanada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "korejski"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "litvanski"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "latvijski"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "makedonski"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malajalamski"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongolski"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Norveški književni"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "holandski"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Norveški novi"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Pandžabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "poljski"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "portugalski"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "brazilski portugalski"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "rumunski"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "ruski"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "slovački"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "slovenački"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "albanski"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "srpski"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "srpski latinski"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "švedski"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr ""
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "tamilski"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "tajlandski"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "turski"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr ""
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ukrajinski"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "vijetnamežanski"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "novokineski"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "starokineski"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Unesite ispravnu vrijednost."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Unesite ispravan URL."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Unesite ispravan „slug“, koji se sastoji od slova, brojki, donjih crta ili "
"crtica."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Unesite ispravnu IPv4 adresu."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr ""
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Unesite samo brojke razdvojene zapetama."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Pobrinite se da je ova vrijednost %(limit_value)s (trenutno je "
"%(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Ova vrijednost mora da bude manja ili jednaka %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Ova vrijednost mora biti veća ili jednaka %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -407,7 +439,7 @@
msgstr[1] ""
msgstr[2] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -419,233 +451,241 @@
msgstr[1] ""
msgstr[2] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s mora da bude jedinstven za %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "i"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s sa ovom vrijednošću %(field_label)s već postoji."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Ovo polje ne može ostati prazno."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Ovo polje ne može biti prazno."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s sa ovom vrijednošću %(field_label)s već postoji."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Polje tipa: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Cijeo broj"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Bulova vrijednost (True ili False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (najviše %(max_length)s znakova)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Cijeli brojevi razdvojeni zapetama"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Datum (bez vremena)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Datum (sa vremenom)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Decimalni broj"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Email adresa"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Putanja fajla"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Broj sa pokrenom zapetom"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Big (8 bajtni) integer"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr ""
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP adresa"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Bulova vrijednost (True, False ili None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr ""
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Vrijeme"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr ""
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr ""
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Strani ključ (tip određen povezanim poljem)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Jedan-na-jedan odnos"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Više-na-više odsnos"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Ovo polje se mora popuniti."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Unesite cijeo broj."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Unesite broj."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
@@ -653,7 +693,7 @@
msgstr[1] ""
msgstr[2] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
@@ -661,7 +701,7 @@
msgstr[1] ""
msgstr[2] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -671,31 +711,31 @@
msgstr[1] ""
msgstr[2] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Unesite ispravan datum."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Unesite ispravno vrijeme"
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Unesite ispravan datum/vrijeme."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Fajl nije prebačen. Provjerite tip enkodiranja formulara."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Fajl nije prebačen."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Prebačen fajl je prazan."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -704,11 +744,11 @@
msgstr[1] ""
msgstr[2] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -716,22 +756,26 @@
"Prebacite ispravan fajl. Fajl koji je prebačen ili nije slika, ili je "
"oštećen."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"%(value)s nije među ponuđenim vrijednostima. Odaberite jednu od ponuđenih."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Unesite listu vrijednosti."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -739,15 +783,15 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
@@ -755,26 +799,34 @@
msgstr[1] ""
msgstr[2] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Redoslijed"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Obriši"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ispravite dupli sadržaj za polja: %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Ispravite dupli sadržaj za polja: %(field)s, koji mora da bude jedinstven."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -783,47 +835,47 @@
"Ispravite dupli sadržaj za polja: %(field_name)s, koji mora da bude "
"jedinstven za %(lookup)s u %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Ispravite duple vrijednosti dole."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Strani ključ se nije poklopio sa instancom roditeljskog ključa."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Odabrana vrijednost nije među ponuđenima. Odaberite jednu od ponuđenih."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Držite „Control“, ili „Command“ na Mac-u da biste obilježili više od jedne "
"stavke."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Trenutno"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Izmjeni"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Očisti"
@@ -839,11 +891,11 @@
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "da,ne,možda"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -851,52 +903,52 @@
msgstr[1] ""
msgstr[2] ""
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "po p."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "prije p."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "ponoć"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "podne"
@@ -1172,36 +1224,26 @@
msgid "December"
msgstr "decembar"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "ili"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
@@ -1209,7 +1251,7 @@
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
@@ -1217,7 +1259,7 @@
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -1225,7 +1267,7 @@
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
@@ -1233,7 +1275,7 @@
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -1241,7 +1283,7 @@
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -1249,53 +1291,79 @@
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
+#: views/csrf.py:105
+msgid "Forbidden"
msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
msgstr ""
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Godina nije naznačena"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Mjesec nije naznačen"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Dan nije naznačen"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Sedmica nije naznačena"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1305,16 +1373,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
diff -Nru python-django-1.6.6/django/conf/locale/ca/formats.py python-django-1.7.4/django/conf/locale/ca/formats.py
--- python-django-1.6.6/django/conf/locale/ca/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ca/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,7 +12,7 @@
MONTH_DAY_FORMAT = r'j \d\e F'
SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y G:i'
-FIRST_DAY_OF_WEEK = 1 # Monday
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
@@ -31,4 +31,3 @@
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
NUMBER_GROUPING = 3
-
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/ca/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ca/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/ca/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ca/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/ca/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ca/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,14 +2,14 @@
#
# Translators:
# Antoni Aloy , 2012
-# Carles Barrobés , 2011-2012
+# Carles Barrobés , 2011-2012,2014
# Jannis Leidel , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
"ca/)\n"
@@ -28,6 +28,10 @@
msgstr "àrab"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "azerbaijanès"
@@ -80,322 +84,350 @@
msgstr "anglès"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "Anglès d'Austràlia"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "anglès britànic"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "espanyol"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "castellà d'Argentina"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "espanyol de Mèxic"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "castellà de Nicaragua"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Espanyol de Veneçuela"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "estonià"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "euskera"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "persa"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "finlandès"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "francès"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "frisi"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "irlandès"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "gallec"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "hebreu"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "croat"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "hongarès"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "indonesi"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "islandès"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "italià"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "japonès"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "georgià"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazakh"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "kannarès"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "coreà"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Luxemburguès"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "lituà"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "letó"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "macedoni"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "malaiàlam "
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "mongol"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr "Burmès"
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "noruec bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepalí"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "holandès"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "noruec nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
-msgstr ""
+msgstr "Ossètic"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "panjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "polonès"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "portuguès"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "portuguès de brasil"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "romanès"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "rus"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "eslovac"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "eslovè"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "albanès"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "serbi"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "serbi llatí"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "suec"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "tàmil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "tailandès"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "turc"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatar"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Udmurt"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ucraïnès"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "xinès simplificat"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "xinès tradicional"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Mapes del lloc"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Arxius estàtics"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Sindicació"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Disseny web"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Introduïu un valor vàlid."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Introduïu una URL vàlida."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr ""
+msgstr "Introduïu un enter vàlid."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Introdueix una adreça de correu electrònic vàlida"
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Introduïu un 'slug' vàlid, consistent en lletres, números, guions o guions "
"baixos."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Introduïu una adreça IPv4 vàlida."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Entreu una adreça IPv6 vàlida."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Entreu una adreça IPv4 o IPv6 vàlida."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Introduïu només dígits separats per comes."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Assegureu-vos que el valor sigui %(limit_value)s (és %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Assegureu-vos que aquest valor sigui menor o igual que %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Assegureu-vos que aquest valor sigui més gran o igual que %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -404,9 +436,13 @@
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Assegureu-vos que aquest valor té almenys %(limit_value)d caràcter (en té "
+"%(show_value)d)."
msgstr[1] ""
+"Assegureu-vos que aquest valor té almenys %(limit_value)d caràcters (en té "
+"%(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -415,297 +451,328 @@
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Assegureu-vos que aquest valor té com a molt %(limit_value)d caràcter (en té "
+"%(show_value)d)."
msgstr[1] ""
+"Assegureu-vos que aquest valor té com a molt %(limit_value)d caràcters (en "
+"té %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "El camp %(field_name)s ha de ser únic per a %(lookup)s %(date_field)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "i"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Ja existeix %(model_name)s amb aquest %(field_label)s."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "Ja existeix %(model_name)s amb aquest %(field_labels)s."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
-msgstr ""
+msgstr "El valor %(value)r no és una opció vàlida."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Aquest camp no pot ser nul."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Aquest camp no pot estar en blanc."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Ja existeix %(model_name)s amb aquest %(field_label)s."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s ha de ser únic per a %(date_field_label)s i %(lookup_type)s."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Camp del tipus: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Enter"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr ""
+msgstr "El valor '%(value)s' ha de ser un nombre enter."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr ""
+msgstr "El valor '%(value)s' ha de ser \"True\" o \"False\"."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Booleà (Cert o Fals)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (de fins a %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Enters separats per comes"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
+"El valor '%(value)s' no té un format de data vàlid. Ha de tenir el format "
+"YYYY-MM-DD."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
+"El valor '%(value)s' té el format correcte (YYYY-MM-DD) però no és una data "
+"vàlida."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Data (sense hora)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
+"El valor '%(value)s' no té un format vàlid. Ha de tenir el format YYYY-MM-DD "
+"HH:MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
+"El valor '%(value)s' té el format correcte (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) però no és una data/hora vàlida."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Data (amb hora)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
-msgstr ""
+msgstr "El valor '%(value)s' ha de ser un nombre decimal."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Adreça de correu electrònic"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Ruta del fitxer"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
-msgstr ""
+msgstr "El valor '%(value)s' ha de ser un número de coma flotant."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Número de coma flotant"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Enter gran (8 bytes)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Adreça IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Adreça IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr ""
+msgstr "El valor '%(value)s' ha de ser None, True o False."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Booleà (Cert, Fals o Cap ('None'))"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Enter positiu"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Enter petit positiu"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (fins a %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Enter petit"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
+"El valor '%(value)s' no té un format vàlid. Ha de tenir el format HH:MM[:ss[."
+"uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
+"El valor '%(value)s' té el format correcte (HH:MM[:ss[.uuuuuu]]) però no és "
+"una hora vàlida."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
-msgstr ""
+msgstr "Dades binàries"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Arxiu"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Imatge"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
-msgstr ""
+msgstr "No hi ha cap instància de %(model)s amb la clau primària %(pk)r."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Clau forana (tipus determinat pel camp relacionat)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Inter-relació un-a-un"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Inter-relació molts-a-molts"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Aquest camp és obligatori."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Introduïu un número sencer."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Introduïu un número."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Assegureu-vos que no hi ha més de %(max)s dígit en total."
+msgstr[1] "Assegureu-vos que no hi ha més de %(max)s dígits en total."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Assegureu-vos que no hi ha més de %(max)s decimal."
+msgstr[1] "Assegureu-vos que no hi ha més de %(max)s decimals."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
msgid_plural ""
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] ""
+"Assegureu-vos que no hi ha més de %(max)s dígit abans de la coma decimal."
msgstr[1] ""
+"Assegureu-vos que no hi ha més de %(max)s dígits abans de la coma decimal."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Introduïu una data vàlida."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Introduïu una hora vàlida."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Introduïu una data/hora vàlides."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"No s'ha enviat cap fitxer. Comproveu el tipus de codificació del formulari."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "No s'ha enviat cap fitxer."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "El fitxer enviat està buit."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr[0] ""
+"Aquest nom d'arxiu hauria de tenir com a molt %(max)d caràcter (en té "
+"%(length)d)."
msgstr[1] ""
+"Aquest nom d'arxiu hauria de tenir com a molt %(max)d caràcters (en té "
+"%(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Si us plau, envieu un fitxer o marqueu la casella de selecció \"netejar\", "
"no ambdós."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -713,64 +780,75 @@
"Carregueu una imatge vàlida. El fitxer que heu carregat no era una imatge o "
"estava corrupte."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Esculliu una opció vàlida. %(value)s no és una de les opcions vàlides."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Introduïu una llista de valors."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Introduïu un valor complet."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
-msgstr ""
+msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
+msgstr "(Camp ocult %(name)s) %(error)s"
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
-msgstr ""
+msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
+msgstr "Falten dades de ManagementForm o s'ha manipulat"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Sisplau envieu com a molt %d formulari."
+msgstr[1] "Sisplau envieu com a molt %d formularis."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Sisplau envieu com a mínim %d formulari."
+msgstr[1] "Sisplau envieu com a mínim %d formularis."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ordre"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Si us plau, corregiu la dada duplicada per a %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Si us plau, corregiu la dada duplicada per a %(field)s, la qual ha de ser "
"única."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -779,34 +857,34 @@
"Si us plau, corregiu la dada duplicada per a %(field_name)s, la qual ha de "
"ser única per a %(lookup)s en %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Si us plau, corregiu els valors duplicats a sota."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clau forana en línia no coincideix amb la clau primària de la instància "
"mare."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Esculli una opció vàlida. Aquesta opció no és una de les opcions disponibles."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%(pk)s\" no és un valor vàlid per a una clau primària."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Premeu la tecla \"Control\", o \"Command\" en un Mac, per seleccionar més "
"d'un valor."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -815,15 +893,15 @@
"No s'ha pogut interpretar %(datetime)s a la zona horària "
"%(current_timezone)s; potser és ambigua o no existeix."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Actualment"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Netejar"
@@ -839,63 +917,63 @@
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "sí,no,potser"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "mitjanit"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "migdia"
@@ -1171,117 +1249,147 @@
msgid "December"
msgstr "desembre"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr ""
+msgstr "Aquesta no és una adreça IPv6 vàlida."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d any"
+msgstr[1] "%d anys"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d mes"
+msgstr[1] "%d mesos"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d setmana"
+msgstr[1] "%d setmanes"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d dia"
+msgstr[1] "%d dies"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d hora"
+msgstr[1] "%d hores"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minut"
+msgstr[1] "%d minuts"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
-msgstr ""
+msgstr "0 minutes"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "No es permeten índexos de directori aquí"
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Prohibit"
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" no existeix"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "La verificació de CSRF ha fallat. Petició abortada."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Índex de %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Estàs veient aquest missatge perquè aquest lloc HTTPS requereix que el teu "
+"navegador enviï una capçalera 'Referer', i no n'ha arribada cap. Aquesta "
+"capçalera es requereix per motius de seguretat, per garantir que el teu "
+"navegador no està sent infiltrat per tercers."
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Si has configurat el teu navegador per deshabilitar capçaleres 'Referer', "
+"sisplau torna-les a habilitar, com a mínim per a aquest lloc, o per a "
+"connexions HTTPs, o per a peticions amb el mateix orígen."
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Estàs veient aquest missatge perquè aquest lloc requereix una galeta CSRF "
+"quan s'envien formularis. Aquesta galeta es requereix per motius de "
+"seguretat, per garantir que el teu navegador no està sent infiltrat per "
+"tercers."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Si has configurat el teu navegador per deshabilitar galetes, sisplau torna-"
+"les a habilitar, com a mínim per a aquest lloc, o per a peticions amb el "
+"mateix orígen."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Més informació disponible amb DEBUG=True."
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "No s'ha especificat any"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "No s'ha especificat mes"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "No s'ha especificat dia"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "No s'ha especificat setmana"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Cap %(verbose_name_plural)s disponible"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1290,7 +1398,7 @@
"Futurs %(verbose_name_plural)s no disponibles perquè %(class_name)s."
"allow_future és Fals."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Cadena invàlida de dats '%(datestr)s' donat el format '%(format)s'"
@@ -1300,16 +1408,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "No s'ha trobat sap %(verbose_name)s que coincideixi amb la petició"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "La pàgina no és 'last', ni es pot convertir en un enter"
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Plana invàlida (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Llista buida i '%(class_name)s.allow_empty' és Fals."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "No es permeten índexos de directori aquí"
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" no existeix"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Índex de %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/cs/formats.py python-django-1.7.4/django/conf/locale/cs/formats.py
--- python-django-1.6.6/django/conf/locale/cs/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/cs/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,34 +12,34 @@
MONTH_DAY_FORMAT = 'j. F'
SHORT_DATE_FORMAT = 'd.m.Y'
SHORT_DATETIME_FORMAT = 'd.m.Y G:i:s'
-FIRST_DAY_OF_WEEK = 1 # Monday
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
DATE_INPUT_FORMATS = (
'%d.%m.%Y', '%d.%m.%y', # '05.01.2006', '05.01.06'
- '%d. %m. %Y', '%d. %m. %y', # '5. 1. 2006', '5. 1. 06'
+ '%d. %m. %Y', '%d. %m. %y', # '5. 1. 2006', '5. 1. 06'
# '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006'
)
# Kept ISO formats as one is in first position
TIME_INPUT_FORMATS = (
- '%H:%M:%S', # '04:30:59'
+ '%H:%M:%S', # '04:30:59'
'%H.%M', # '04.30'
'%H:%M', # '04:30'
)
DATETIME_INPUT_FORMATS = (
'%d.%m.%Y %H:%M:%S', # '05.01.2006 04:30:59'
- '%d.%m.%Y %H:%M:%S.%f', # '05.01.2006 04:30:59.000200'
+ '%d.%m.%Y %H:%M:%S.%f', # '05.01.2006 04:30:59.000200'
'%d.%m.%Y %H.%M', # '05.01.2006 04.30'
'%d.%m.%Y %H:%M', # '05.01.2006 04:30'
'%d.%m.%Y', # '05.01.2006'
'%d. %m. %Y %H:%M:%S', # '05. 01. 2006 04:30:59'
- '%d. %m. %Y %H:%M:%S.%f', # '05. 01. 2006 04:30:59.000200'
+ '%d. %m. %Y %H:%M:%S.%f', # '05. 01. 2006 04:30:59.000200'
'%d. %m. %Y %H.%M', # '05. 01. 2006 04.30'
'%d. %m. %Y %H:%M', # '05. 01. 2006 04:30'
'%d. %m. %Y', # '05. 01. 2006'
'%Y-%m-%d %H.%M', # '2006-01-05 04.30'
)
DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = '\xa0' # non-breaking space
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
NUMBER_GROUPING = 3
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/cs/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/cs/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/cs/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/cs/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/cs/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/cs/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -4,14 +4,14 @@
# Jannis Leidel , 2011
# Jan Papež , 2012
# Jirka Vejrazka , 2011
-# Vlada Macek , 2012-2013
+# Vlada Macek , 2012-2014
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-11-18 11:33+0000\n"
-"Last-Translator: Vlada Macek \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
"cs/)\n"
"MIME-Version: 1.0\n"
@@ -29,6 +29,10 @@
msgstr "arabsky"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Ázerbájdžánština"
@@ -81,320 +85,348 @@
msgstr "anglicky"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "australskou angličtinou"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "britskou angličtinou"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "esperantsky"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "španělsky"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "argentinskou španělštinou"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Mexická španělština"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Nikaragujskou španělštinou"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "venezuelskou španělštinou"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "estonsky"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "baskicky"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "persky"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "finsky"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "francouzsky"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "frísky"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "irsky"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "galicijsky"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "hebrejsky"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "hindsky"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "chorvatsky"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "maďarsky"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "indonésky"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "islandsky"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "italsky"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "japonsky"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "gruzínsky"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "kazašsky"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "khmersky"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "kannadsky"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "korejsky"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "lucembursky"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "litevsky"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "lotyšsky"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "makedonsky"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "malajálamsky"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "mongolsky"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "barmštinou"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "norsky (Bokmål)"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "nepálsky"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "nizozemsky"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "norsky (Nynorsk)"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "osetštinou"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "paňdžábsky"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "polsky"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "portugalsky"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "brazilskou portugalštinou"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "rumunsky"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "rusky"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "slovensky"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "slovinsky"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "albánsky"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "srbsky"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "srbsky (latinkou)"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "švédsky"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "svahilsky"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "tamilsky"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "telužsky"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "thajsky"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "turecky"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "tatarsky"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "udmurtsky"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ukrajinsky"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdština"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "vietnamsky"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "čínsky (zjednodušeně)"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "čínsky (tradičně)"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Mapy webu"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Statické soubory"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Syndikace"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Design webu"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Vložte platnou hodnotu."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Vložte platnou adresu URL."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr "Vložte platné celé číslo."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Zadejte platnou e-mailovou adresu."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Vložte platný identifikátor složený pouze z písmen, čísel, podtržítek a "
"pomlček."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Vložte platnou adresu typu IPv4."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Zadejte platnou adresu typu IPv6."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Zadejte platnou adresu typu IPv4 nebo IPv6."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Vložte pouze číslice oddělené čárkami."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Hodnota musí být %(limit_value)s (nyní je %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Hodnota musí být menší nebo rovna %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Hodnota musí být větší nebo rovna %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -409,7 +441,7 @@
msgstr[2] ""
"Tato hodnota má mít nejméně %(limit_value)d znaků (nyní má %(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -424,75 +456,86 @@
msgstr[2] ""
"Tato hodnota má mít nejvýše %(limit_value)d znaků (nyní má %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"Pole %(field_name)s musí být unikátní testem %(lookup)s pole %(date_field)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "a"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
msgstr ""
-"Položka %(model_name)s s touto hodnotou v poli %(field_label)s již existuje."
+"Položka %(model_name)s s touto kombinací hodnot v polích %(field_labels)s "
+"již existuje."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr "Hodnota %(value)r není platná možnost."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Pole nemůže být null."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Pole nemůže být prázdné."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr ""
+"Položka %(model_name)s s touto hodnotou v poli %(field_label)s již existuje."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"Pole %(field_label)s musí být unikátní testem %(lookup_type)s pro pole "
+"%(date_field_label)s."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Pole typu: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Celé číslo"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr "Hodnota '%(value)s' musí být celé číslo."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr "Hodnota '%(value)s' musí být buď True nebo False."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Pravdivost (buď Ano (True), nebo Ne (False))"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Řetězec (max. %(max_length)s znaků)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Celá čísla oddělená čárkou"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr "Hodnota '%(value)s' není platné datum. Musí být ve tvaru RRRR-MM-DD."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
@@ -501,11 +544,11 @@
"Ačkoli hodnota '%(value)s' je ve správném tvaru (RRRR-MM-DD), jde o neplatné "
"datum."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Datum (bez času)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
@@ -514,7 +557,7 @@
"Hodnota '%(value)s' je v neplatném tvaru, který má být RRRR-MM-DD HH:MM[:SS[."
"uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
@@ -523,79 +566,79 @@
"Ačkoli hodnota '%(value)s' je ve správném tvaru (RRRR-MM-DD HH:MM[:SS[."
"uuuuuu]][TZ]), jde o neplatné datum a čas."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Datum (s časem)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr "Hodnota '%(value)s' musí být desítkové číslo."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Desetinné číslo"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "E-mailová adresa"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Cesta k souboru"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr "Hodnota '%(value)s' musí být reálné číslo."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Číslo s pohyblivou řádovou čárkou"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Velké číslo (8 bajtů)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Adresa IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Adresa IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr "Hodnota '%(value)s' musí být buď None, True nebo False."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Pravdivost (buď Ano (True), Ne (False) nebo Nic (None))"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Kladné celé číslo"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Kladné malé celé číslo"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Identifikátor (nejvýše %(max_length)s znaků)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Malé celé číslo"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
@@ -603,7 +646,7 @@
msgstr ""
"Hodnota '%(value)s' je v neplatném tvaru, který má být HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
@@ -612,56 +655,56 @@
"Ačkoli hodnota '%(value)s' je ve správném tvaru (HH:MM[:ss[.uuuuuu]]), jde o "
"neplatný čas."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Čas"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Přímá binární data"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Soubor"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Obrázek"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr "Položka typu %(model)s s primárním klíčem %(pk)r neexistuje."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Cizí klíč (typ určen pomocí souvisejícího pole)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Vazba jedna-jedna"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Vazba mnoho-mnoho"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Toto pole je třeba vyplnit."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Vložte celé číslo."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Vložte číslo."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
@@ -669,7 +712,7 @@
msgstr[1] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslice."
msgstr[2] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslic."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
@@ -677,7 +720,7 @@
msgstr[1] "Ujistěte se, že pole neobsahuje více než %(max)s desetinná místa."
msgstr[2] "Ujistěte se, že pole neobsahuje více než %(max)s desetinných míst."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -693,32 +736,32 @@
"Ujistěte se, že hodnota neobsahuje více než %(max)s míst před desetinnou "
"čárkou (tečkou)."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Vložte platné datum."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Vložte platný čas."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Vložte platné datum a čas."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Soubor nebyl odeslán. Zkontrolujte parametr \"encoding type\" formuláře."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Žádný soubor nebyl odeslán."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Odeslaný soubor je prázdný."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -730,32 +773,36 @@
msgstr[2] ""
"Tento název souboru má mít nejvýše %(max)d znaků (nyní má %(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Musíte vybrat cestu k souboru nebo vymazat výběr, ne obojí."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
"Nahrajte platný obrázek. Odeslaný soubor buď nebyl obrázek nebo byl poškozen."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Vyberte platnou možnost, \"%(value)s\" není k dispozici."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Vložte seznam hodnot."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Vložte úplnou hodnotu."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(Skryté pole %(name)s) %(error)s"
@@ -763,15 +810,15 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr "Data objektu ManagementForm chybí nebo byla pozměněna."
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
@@ -779,25 +826,33 @@
msgstr[1] "Odešlete %d nebo méně formulářů."
msgstr[2] "Odešlete %d nebo méně formulářů."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Odešlete %d nebo více formulářů."
+msgstr[1] "Odešlete %d nebo více formulářů."
+msgstr[2] "Odešlete %d nebo více formulářů."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Pořadí"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Odstranit"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Opravte duplicitní data v poli %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Opravte duplicitní data v poli %(field)s, které musí být unikátní."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -806,32 +861,32 @@
"Opravte duplicitní data v poli %(field_name)s, které musí být unikátní "
"testem %(lookup)s pole %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Odstraňte duplicitní hodnoty níže."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Cizí klíč typu inline neodpovídá primárnímu klíči v rodičovské položce."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Vyberte platnou možnost. Tato není k dispozici."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "Hodnota \"%(pk)s\" není platný primární klíč."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Výběr více než jedné položky je možný přidržením klávesy \"Control\" (nebo "
"\"Command\" na Macu)."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -840,15 +895,15 @@
"Hodnotu %(datetime)s nelze interpretovat v časové zóně %(current_timezone)s; "
"může to být nejednoznačné nebo nemusí existovat."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Aktuálně"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Změnit"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Zrušit"
@@ -864,11 +919,11 @@
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "ano, ne, možná"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -876,52 +931,52 @@
msgstr[1] "%(size)d bajty"
msgstr[2] "%(size)d bajtů"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "odp."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "dop."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "odp."
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "dop."
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "půlnoc"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "poledne"
@@ -1197,36 +1252,26 @@
msgid "December"
msgstr "prosince"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "Není možné importovat knihovny Pillow ani PIL: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "Modul '_imaging' pro PIL není možné importovat: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "Toto není platná adresa typu IPv6."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "nebo"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
@@ -1234,7 +1279,7 @@
msgstr[1] "%d roky"
msgstr[2] "%d let"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
@@ -1242,7 +1287,7 @@
msgstr[1] "%d měsíce"
msgstr[2] "%d měsíců"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -1250,7 +1295,7 @@
msgstr[1] "%d týdny"
msgstr[2] "%d týdnů"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
@@ -1258,7 +1303,7 @@
msgstr[1] "%d dny"
msgstr[2] "%d dní"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -1266,7 +1311,7 @@
msgstr[1] "%d hodiny"
msgstr[2] "%d hodin"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -1274,46 +1319,84 @@
msgstr[1] "%d minuty"
msgstr[2] "%d minut"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minut"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Indexy adresářů zde nejsou povoleny."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Nepřístupné (Forbidden)"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "Selhalo ověření typu CSRF. Požadavek byl zadržen."
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" neexistuje"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Tato zpráva se zobrazuje, protože tento web na protokolu HTTPS požaduje "
+"záhlaví Referer od vašeho webového prohlížeče. Záhlaví je požadováno z "
+"bezpečnostních důvodů, aby se zajistilo, že vašeho prohlížeče se nezmocnil "
+"někdo další."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Index adresáře %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Pokud má váš prohlížeč záhlaví Referer vypnuté, žádáme vás o jeho zapnutí, "
+"alespoň pro tento web nebo pro spojení typu HTTPS nebo pro požadavky typu "
+"\"stejný původ\" (same origin)."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Tato zpráva se zobrazuje, protože tento web při odesílání formulářů požaduje "
+"v souboru cookie údaj CSRF, a to z bezpečnostních důvodů, aby se zajistilo, "
+"že se vašeho prohlížeče nezmocnil někdo další."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Pokud má váš prohlížeč soubory cookie vypnuté, žádáme vás o jejich zapnutí, "
+"alespoň pro tento web nebo pro požadavky typu \"stejný původ\" (same origin)."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "V případě zapnutí volby DEBUG=True bude k dispozici více informací."
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Nebyl specifikován rok"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Nebyl specifikován měsíc"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Nebyl specifikován den"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Nebyl specifikován týden"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s nejsou k dispozici"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1322,7 +1405,7 @@
"%(verbose_name_plural)s s budoucím datem nejsou k dipozici protoze "
"%(class_name)s.allow_future je False"
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Datum '%(datestr)s' neodpovídá formátu '%(format)s'"
@@ -1332,16 +1415,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Nepodařilo se nalézt žádný objekt %(verbose_name)s"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Požadavek na stránku nemohl být konvertován na číslo, ani není 'last'"
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Neplatná stránka (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "List je prázdný a '%(class_name)s.allow_empty' je nastaveno na False"
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Indexy adresářů zde nejsou povoleny."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" neexistuje"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Index adresáře %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/cy/formats.py python-django-1.7.4/django/conf/locale/cy/formats.py
--- python-django-1.6.6/django/conf/locale/cy/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/cy/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -5,20 +5,34 @@
# The *_FORMAT strings use the Django date format syntax,
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = 'd F Y'
-TIME_FORMAT = 'g:i:s A'
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
-# MONTH_DAY_FORMAT =
-SHORT_DATE_FORMAT = 'j M Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+DATE_FORMAT = 'j F Y' # '25 Hydref 2006'
+TIME_FORMAT = 'P' # '2:30 y.b.'
+DATETIME_FORMAT = 'j F Y, P' # '25 Hydref 2006, 2:30 y.b.'
+YEAR_MONTH_FORMAT = 'F Y' # 'Hydref 2006'
+MONTH_DAY_FORMAT = 'j F' # '25 Hydref'
+SHORT_DATE_FORMAT = 'd/m/Y' # '25/10/2006'
+SHORT_DATETIME_FORMAT = 'd/m/Y P' # '25/10/2006 2:30 y.b.'
+FIRST_DAY_OF_WEEK = 1 # 'Dydd Llun'
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
-# DECIMAL_SEPARATOR =
-# THOUSAND_SEPARATOR =
-# NUMBER_GROUPING =
+DATE_INPUT_FORMATS = (
+ '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
+)
+DATETIME_INPUT_FORMATS = (
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M:%S.%f', # '2006-10-25 14:30:59.000200'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+ '%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'
+ '%d/%m/%Y %H:%M:%S.%f', # '25/10/2006 14:30:59.000200'
+ '%d/%m/%Y %H:%M', # '25/10/2006 14:30'
+ '%d/%m/%Y', # '25/10/2006'
+ '%d/%m/%y %H:%M:%S', # '25/10/06 14:30:59'
+ '%d/%m/%y %H:%M:%S.%f', # '25/10/06 14:30:59.000200'
+ '%d/%m/%y %H:%M', # '25/10/06 14:30'
+ '%d/%m/%y', # '25/10/06'
+)
+DECIMAL_SEPARATOR = '.'
+THOUSAND_SEPARATOR = ','
+NUMBER_GROUPING = 3
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/cy/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/cy/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/cy/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/cy/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/cy/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/cy/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,14 +2,14 @@
#
# Translators:
# Jannis Leidel , 2011
-# Maredudd ap Gwyndaf , 2012
+# Maredudd ap Gwyndaf , 2012,2014
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
-"Last-Translator: Jannis Leidel \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-26 14:29+0000\n"
+"Last-Translator: Maredudd ap Gwyndaf \n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
"cy/)\n"
"MIME-Version: 1.0\n"
@@ -21,15 +21,19 @@
#: conf/global_settings.py:51
msgid "Afrikaans"
-msgstr ""
+msgstr "Affricaneg"
#: conf/global_settings.py:52
msgid "Arabic"
msgstr "Arabeg"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "Astwrieg"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
-msgstr ""
+msgstr "Azerbaijanaidd"
#: conf/global_settings.py:54
msgid "Bulgarian"
@@ -37,7 +41,7 @@
#: conf/global_settings.py:55
msgid "Belarusian"
-msgstr ""
+msgstr "Belarwseg"
#: conf/global_settings.py:56
msgid "Bengali"
@@ -45,7 +49,7 @@
#: conf/global_settings.py:57
msgid "Breton"
-msgstr ""
+msgstr "Llydaweg"
#: conf/global_settings.py:58
msgid "Bosnian"
@@ -80,318 +84,349 @@
msgstr "Saesneg"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "Saesneg Awstralia"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Saesneg Prydain"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Sbaeneg"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Sbaeneg Ariannin"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
-msgstr ""
+msgstr "Sbaeneg Mecsico"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
-msgstr ""
+msgstr "Sbaeneg Nicaragwa"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
-msgstr ""
+msgstr "Sbaeneg Feneswela"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estoneg"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Basgeg"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persieg"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Ffinneg"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Ffrangeg"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Ffrisieg"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Gwyddeleg"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galisieg"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebraeg"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Croasieg"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Hwngareg"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
-msgstr ""
+msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indoneseg"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr "Ido"
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Islandeg"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Eidaleg"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Siapanëeg"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Georgeg"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
-msgstr ""
+msgstr "Casacstanaidd"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
-msgstr ""
+msgstr "Chmereg"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
-msgstr ""
+msgstr "Canadeg"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Corëeg"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
-msgstr ""
+msgstr "Lwcsembergeg"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
-msgstr ""
+msgstr "Lithwaneg"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
-msgstr ""
+msgstr "Latfieg"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
-msgstr ""
+msgstr "Macedoneg"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
-msgstr ""
+msgstr "Malaialam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
-msgstr ""
+msgstr "Mongoleg"
-#: conf/global_settings.py:101
-msgid "Burmese"
-msgstr ""
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr "Marathi"
#: conf/global_settings.py:102
-msgid "Norwegian Bokmal"
-msgstr ""
+msgid "Burmese"
+msgstr "Byrmaneg"
#: conf/global_settings.py:103
-msgid "Nepali"
-msgstr ""
+msgid "Norwegian Bokmal"
+msgstr "Bocmal Norwyeg "
#: conf/global_settings.py:104
+msgid "Nepali"
+msgstr "Nepaleg"
+
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Iseldireg"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "Ninorsk Norwyeg"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
-msgstr ""
+msgstr "Osetieg"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
-msgstr ""
+msgstr "Pwnjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Pwyleg"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portiwgaleg"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Portiwgaleg Brasil"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Romaneg"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Rwsieg"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slofaceg"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Slofeneg"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
-msgstr ""
+msgstr "Albaneg"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbeg"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
-msgstr ""
+msgstr "Lladin Serbiaidd"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Swedeg"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
-msgstr ""
+msgstr "Telwgw"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
-msgstr ""
+msgstr "Tai"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Twrceg"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
-msgstr ""
+msgstr "Tatareg"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
-msgstr ""
+msgstr "Wdmwrteg"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
-msgstr ""
+msgstr "Wcreineg"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
-msgstr ""
+msgstr "Wrdw"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
-msgstr ""
+msgstr "Fietnameg"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
-msgstr "Tsieinëeg Symledig"
+msgstr "Tsieinëeg Syml"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Tseinëeg Traddodiadol"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Mapiau Safle"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Ffeiliau Statig"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Syndicetiad"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Dylunio Gwe"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Rhowch werth dilys."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Rhowch URL dilys."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr ""
+msgstr "Rhowch gyfanrif dilys."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
-msgstr ""
+msgstr "Rhowch gyfeiriad ebost dilys."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
+"Rhowch 'falwen' dilys yn cynnwys llythrennau, rhifau, tanlinellau neu "
+"cysylltnodau."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
-msgstr ""
+msgstr "Rhowch gyfeiriad IPv4 dilys."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
-msgstr ""
+msgstr "Rhowch gyfeiriad IPv6 dilys."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "Rhowch gyfeiriad IPv4 neu IPv6 dilys."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
-msgstr "Rhowch digidau gwahanu gyda atalnodau yn unig."
+msgstr "Rhowch ddigidau wedi'i gwahanu gan gomas yn unig."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
+"Sicrhewch taw y gwerth yw %(limit_value)s (%(show_value)s yw ar hyn o bryd)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
+msgstr "Sicrhewch fod y gwerth hwn yn fwy neu'n llai na %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
+msgstr "Sicrhewch fod y gwerth yn fwy na neu'n gyfartal â %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -400,11 +435,19 @@
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Sicrhewch fod gan y gwerth hwn oleiaf %(limit_value)d nod (mae ganddo "
+"%(show_value)d)."
msgstr[1] ""
+"Sicrhewch fod gan y gwerth hwn oleiaf %(limit_value)d nod (mae ganddo "
+"%(show_value)d)."
msgstr[2] ""
+"Sicrhewch fod gan y gwerth hwn oleiaf %(limit_value)d nod (mae ganddo "
+"%(show_value)d)."
msgstr[3] ""
+"Sicrhewch fod gan y gwerth hwn oleiaf %(limit_value)d nod (mae ganddo "
+"%(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -413,419 +456,475 @@
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Sicrhewch fod gan y gwerth hwn ddim mwy na %(limit_value)d nod (mae ganddo "
+"%(show_value)d)."
msgstr[1] ""
+"Sicrhewch fod gan y gwerth hwn ddim mwy na %(limit_value)d nod (mae ganddo "
+"%(show_value)d)."
msgstr[2] ""
+"Sicrhewch fod gan y gwerth hwn ddim mwy na %(limit_value)d nod (mae ganddo "
+"%(show_value)d)."
msgstr[3] ""
+"Sicrhewch fod gan y gwerth hwn ddim mwy na %(limit_value)d nod (mae ganddo "
+"%(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
-msgstr "ac"
+msgstr "a"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr ""
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "Mae %(model_name)s gyda'r %(field_labels)s hyn yn bodoli'n barod."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
-msgstr ""
+msgstr "Nid yw gwerth %(value)r yn ddewis dilys."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
-msgstr ""
+msgstr "Ni all y maes hwn fod yn 'null'."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
+msgstr "Ni all y maes hwn fod yn wag."
+
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Mae %(model_name)s gyda'r %(field_label)s hwn yn bodoli'n barod."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
msgstr ""
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Maes o fath: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
-msgstr ""
+msgstr "cyfanrif"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr ""
+msgstr "Rhaid i'r gwerth '%(value)s' fod yn gyfanrif."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr ""
+msgstr "Rhaid i werth '%(value)s' for unai'n True neu False."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Boleaidd (Unai True neu False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
-msgstr ""
+msgstr "String (hyd at %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
-msgstr ""
+msgstr "Cyfanrifau wedi'u gwahanu gan gomas"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
+"Mae gan werth '%(value)s' fformat dyddiad annilys. Rhaid iddo fod yn y "
+"fformat BBBB-MM-DD."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
+"Mae'r gwerth '%(value)s' yn y fformat cywir (BBBB-MM-DD) ond mae'r dyddiad "
+"yn annilys"
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Dyddiad (heb amser)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
+"Mae '%(value)s' mewn fformat annilys. Rhaid iddo fod yn y fformat BBBB-MM-DD "
+"AA:MM[:ee[.uuuuuu]][CA]"
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
+"Mae '%(value)s' yn y fformat cywir (BBBB-MM-DD AA:MM[:ee[.uuuuuu]][CA]) on "
+"mae'n ddyddiad/amser annilys."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
-msgstr "Dyddiad (gyda amser)"
+msgstr "Dyddiad (gydag amser)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
-msgstr ""
+msgstr "Rhaid i '%(value)s' fod yn ddegolyn."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Rhif degol"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
-msgstr ""
+msgstr "Cyfeiriad ebost"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Llwybr ffeil"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
-msgstr ""
+msgstr "Rhaid i '%(value)s' fod yn rif pwynt arnawf."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
-msgstr ""
+msgstr "Rhif pwynt symudol"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "Cyfanrif mawr (8 beit)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
-msgstr ""
+msgstr "Cyfeiriad IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "cyfeiriad IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr ""
+msgstr "Rhaid i '%(value)s' gael y gwerth None, True neu False."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
-msgstr "Boole (Naill ai True, False neu None)"
+msgstr "Boleaidd (Naill ai True, False neu None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
-msgstr ""
+msgstr "Cyfanrif positif"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
-msgstr ""
+msgstr "Cyfanrif bach positif"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Malwen (hyd at %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
-msgstr ""
+msgstr "Cyfanrif bach"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Testun"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
+"Mae gan y gwerth '%(value)s' fformat annilys. Rhaid iddo fod yn y fformat AA:"
+"MM[:ee[.uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
+"Mae'r gwerth '%(value)s' yn y fformat cywir AA:MM[:ee[.uuuuuu]] ond mae'r "
+"amser yn annilys."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Amser"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
-msgstr ""
+msgstr "Data deuol crai"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
-msgstr ""
+msgstr "Ffeil"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
-msgstr ""
+msgstr "Delwedd"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
-msgstr ""
+msgstr "Nid yw %(model)s gyda pk %(pk)r yn bodoli."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "Allwedd Estron (math yn ddibynol ar y maes cysylltiedig)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
-msgstr ""
+msgstr "Perthynas un-i-un"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "Perthynas llawer-i-lawer"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
-msgstr "Mae angen y faes yma."
+msgstr "Mae angen y maes hwn."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
-msgstr "Rhowch rhif cyfan."
+msgstr "Rhowch cyfanrif."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
-msgstr ""
+msgstr "Rhowch rif."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Sicrhewch nad oes mwy nag %(max)s digid i gyd."
+msgstr[1] "Sicrhewch nad oes mwy na %(max)s ddigid i gyd."
+msgstr[2] "Sicrhewch nad oes mwy na %(max)s digid i gyd."
+msgstr[3] "Sicrhewch nad oes mwy na %(max)s digid i gyd."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Sicrhewch nad oes mwy nag %(max)s lle degol."
+msgstr[1] "Sicrhewch nad oes mwy na %(max)s le degol."
+msgstr[2] "Sicrhewch nad oes mwy na %(max)s lle degol."
+msgstr[3] "Sicrhewch nad oes mwy na %(max)s lle degol."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
msgid_plural ""
"Ensure that there are no more than %(max)s digits before the decimal point."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Sicrhewch nad oes mwy nag %(max)s digid cyn y pwynt degol."
+msgstr[1] "Sicrhewch nad oes mwy na %(max)s ddigid cyn y pwynt degol."
+msgstr[2] "Sicrhewch nad oes mwy na %(max)s digid cyn y pwynt degol."
+msgstr[3] "Sicrhewch nad oes mwy na %(max)s digid cyn y pwynt degol."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
-msgstr ""
+msgstr "Rhif ddyddiad dilys."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
-msgstr ""
+msgstr "Rhowch amser dilys."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
-msgstr ""
+msgstr "Rhowch ddyddiad/amser dilys."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
+msgstr "Ni anfonwyd ffeil. Gwiriwch math yr amgodiad ar y ffurflen."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
-msgstr ""
+msgstr "Ni anfonwyd ffeil."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Mae'r ffeil yn wag."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr[0] ""
+"Sicrhewch fod gan enw'r ffeil ar y mwyaf %(max)d nod (mae ganddo %(length)d)."
msgstr[1] ""
+"Sicrhewch fod gan enw'r ffeil ar y mwyaf %(max)d nod (mae ganddo %(length)d)."
msgstr[2] ""
+"Sicrhewch fod gan enw'r ffeil ar y mwyaf %(max)d nod (mae ganddo %(length)d)."
msgstr[3] ""
+"Sicrhewch fod gan enw'r ffeil ar y mwyaf %(max)d nod (mae ganddo %(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Nail ai cyflwynwych ffeil neu dewisiwch y blwch gwiriad, ond nid y ddau."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-"Llwythwch delwedd dilys. Doedd y delwedd a llwythwyd dim yn ddelwedd dilys, "
-"neu roedd o'n ddelwedd llwgr."
+"Llwythwch ddelwedd dilys. Doedd y ddelwedd a lwythwyd ddim yn ddelwedd "
+"dilys, neu roedd yn ddelwedd llygredig."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
+"Dewiswch ddewisiad dilys. Nid yw %(value)s yn un o'r dewisiadau sydd ar gael."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
-msgstr ""
+msgstr "Rhowch restr o werthoedd."
+
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Rhowch werth cyflawn."
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
-msgstr ""
+msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
+msgstr "(Maes cudd %(name)s) %(error)s"
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
-msgstr ""
+msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
+msgstr "Mae data ManagementForm ar goll neu mae rhywun wedi ymyrryd ynddo"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Cyflwynwch %d neu lai o ffurflenni."
+msgstr[1] "Cyflwynwch %d neu lai o ffurflenni."
+msgstr[2] "Cyflwynwch %d neu lai o ffurflenni."
+msgstr[3] "Cyflwynwch %d neu lai o ffurflenni."
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Cyflwynwch %d neu fwy o ffurflenni."
+msgstr[1] "Cyflwynwch %d neu fwy o ffurflenni."
+msgstr[2] "Cyflwynwch %d neu fwy o ffurflenni."
+msgstr[3] "Cyflwynwch %d neu fwy o ffurflenni."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
-msgstr ""
+msgstr "Trefn"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Dileu"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
+msgstr "Cywirwch y data dyblyg ar gyfer %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
+"Cywirwch y data dyblyg ar gyfer %(field)s, sydd yn gorfod bod yn unigryw."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
+"Cywirwch y data dyblyg ar gyfer %(field_name)s sydd yn gorfod bod yn unigryw "
+"ar gyfer %(lookup)s yn %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
-msgstr ""
+msgstr "Cywirwch y gwerthoedd dyblyg isod."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
+"Nid yw'r allwedd estron mewnlin yn cydfynd gyda allwedd gynradd enghraifft y "
+"rhiant."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
+"Dewiswch ddewisiad dilys. Nid yw'r dewisiad yn un o'r dewisiadau sydd ar "
+"gael."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "Nid yw \"%(pk)s\" yn werth dilys ar gyfer allwedd cynradd."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
+msgstr "Daliwch \"Control\", neu \"Command\" ar y Mac, i ddewis mwy nag un."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
+"Ni ellir dehongli %(datetime)s yn y gylchfa amser %(current_timezone)s; "
+"mae'n amwys neu ddim yn bodoli."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
-msgstr ""
+msgstr "Ar hyn o bryd"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
-msgstr "Newidio"
+msgstr "Newid"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
-msgstr ""
+msgstr "Clirio"
#: forms/widgets.py:546
msgid "Unknown"
-msgstr ""
+msgstr "Anhysbys"
#: forms/widgets.py:547
msgid "Yes"
@@ -835,67 +934,67 @@
msgid "No"
msgstr "Na"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "ie,na,efallai"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%(size)d beit"
+msgstr[1] "%(size)d beit"
+msgstr[2] "%(size)d beit"
+msgstr[3] "%(size)d beit"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
-msgstr ""
+msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
-msgstr ""
+msgstr "y.h."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
-msgstr ""
+msgstr "y.b."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
-msgstr ""
+msgstr "YH"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
-msgstr ""
+msgstr "YB"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
-msgstr ""
+msgstr "canol nos"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
-msgstr ""
+msgstr "canol dydd"
#: utils/dates.py:6
msgid "Monday"
@@ -1052,12 +1151,12 @@
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr ""
+msgstr "Ion."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr ""
+msgstr "Chwe."
#: utils/dates.py:33
msgctxt "abbrev. month"
@@ -1077,37 +1176,37 @@
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Mehefin"
+msgstr "Meh."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Gorffenaf"
+msgstr "Gorff."
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr ""
+msgstr "Awst"
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr ""
+msgstr "Medi"
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr ""
+msgstr "Hydr."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr ""
+msgstr "Tach."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr ""
+msgstr "Rhag."
#: utils/dates.py:45
msgctxt "alt. month"
@@ -1169,155 +1268,199 @@
msgid "December"
msgstr "Rhagfyr"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr ""
+msgstr "Nid yw hwn yn gyfeiriad IPv6 dilys."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
-msgstr ""
+msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "neu"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
-msgstr ""
+msgstr ","
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d blwyddyn"
+msgstr[1] "%d flynedd"
+msgstr[2] "%d blwyddyn"
+msgstr[3] "%d blwyddyn"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d mis"
+msgstr[1] "%d fis"
+msgstr[2] "%d mis"
+msgstr[3] "%d mis"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d wythnos"
+msgstr[1] "%d wythnos"
+msgstr[2] "%d wythnos"
+msgstr[3] "%d wythnos"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d diwrnod"
+msgstr[1] "%d ddiwrnod"
+msgstr[2] "%d diwrnod"
+msgstr[3] "%d diwrnod"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d awr"
+msgstr[1] "%d awr"
+msgstr[2] "%d awr"
+msgstr[3] "%d awr"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d munud"
+msgstr[1] "%d funud"
+msgstr[2] "%d munud"
+msgstr[3] "%d munud"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
-msgstr ""
+msgstr "0 munud"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr ""
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Gwaharddedig"
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr ""
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "Gwirio CSRF wedi methu. Ataliwyd y cais."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Rydych yn gweld y neges hwn can fod y safle HTTPS hwn angen 'Referer header' "
+"i gael ei anfon gan ei porwr, ond ni anfonwyd un. Mae angen y pennyn hwn ar "
+"mwyn diogelwch, i sicrhau na herwgipiwyd eich porwr gan trydydd parti."
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Os ydych wedi analluogi pennynau 'Referer' yn eich porwr yn galluogwch nhw, "
+"oleiaf ar gyfer y safle hwn neu ar gyfer cysylltiadau HTTPS neu ar gyfer "
+"ceisiadau 'same-origin'."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Dangosir y neges hwn oherwydd bod angen cwci CSRF ar y safle hwn pan yn "
+"anfon ffurflenni. Mae angen y cwci ar gyfer diogelwch er mwyn sicrhau nad "
+"oes trydydd parti yn herwgipio eich porwr."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
msgstr ""
+"Os ydych wedi analluogi cwcis, galluogwch nhw, oleiaf i'r safle hwn neu "
+"ceisiadau 'same-origin'."
-#: views/generic/dates.py:42
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Mae mwy o wybodaeth ar gael gyda DEBUG=True"
+
+#: views/generic/dates.py:43
msgid "No year specified"
-msgstr ""
+msgstr "Dim blwyddyn wedi’i bennu"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
-msgstr ""
+msgstr "Dim mis wedi’i bennu"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
-msgstr ""
+msgstr "Dim diwrnod wedi’i bennu"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
-msgstr ""
+msgstr "Dim wythnos wedi’i bennu"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "Dim %(verbose_name_plural)s ar gael"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
+"%(verbose_name_plural)s i'r dyfodol ddim ar gael oherwydd mae %(class_name)s."
+"allow_future yn 'False'. "
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
+"Rhoddwyd y fformat '%(format)s' i'r llynyn dyddiad annilys '%(datestr)s'"
#: views/generic/detail.py:54
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "Ni ganfuwyd %(verbose_name)s yn cydweddu â'r ymholiad"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "Nid yw'r dudalen yn 'last', ac ni ellir ei drosi i int."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr ""
+msgstr "Tudalen annilys (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "Rhestr wag a '%(class_name)s.allow_empty' yn False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Ni ganiateir mynegai cyfeiriaduron yma."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "Nid yw \"%(path)s\" yn bodoli"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Mynegai %(directory)s"
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/da/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/da/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/da/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/da/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/da/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/da/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,18 +2,19 @@
#
# Translators:
# Christian Joergensen , 2012
-# Erik Wognsen , 2013
-# Finn Gruwier, 2011
+# Danni Randeris , 2014
+# Erik Wognsen , 2013-2014
+# Finn Gruwier Larsen, 2011
# Jannis Leidel , 2011
# jonaskoelker , 2012
-# mchro , 2013
+# Mads Chr. Olesen , 2013
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-10-28 18:30+0000\n"
-"Last-Translator: Erik Wognsen \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
"da/)\n"
"MIME-Version: 1.0\n"
@@ -31,6 +32,10 @@
msgstr "arabisk"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "azerbaidjansk"
@@ -83,320 +88,348 @@
msgstr "engelsk"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "australsk engelsk"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "britisk engelsk"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "spansk"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "argentinsk spansk"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "mexikansk spansk"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "nicaraguansk spansk"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "venezuelansk spansk"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "estisk"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "baskisk"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "persisk"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "finsk"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "fransk"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "frisisk"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "irsk"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "galicisk"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "hebraisk"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "kroatisk"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "ungarsk"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "indonesisk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "islandsk"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "italiensk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "japansk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "georgisk"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "kasakhisk"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "koreansk"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "luxembourgisk"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "litauisk"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "lettisk"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "makedonsk"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "malaysisk"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "mongolsk"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "burmesisk"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "norsk bokmål"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "nepalesisk"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "hollandsk"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "norsk nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "ossetisk"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "punjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "polsk"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "portugisisk"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "brasiliansk portugisisk"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "rumænsk"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "russisk"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "slovakisk"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "slovensk"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "albansk"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "serbisk"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "serbisk (latin)"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "svensk"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "thai"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "tyrkisk"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "tatarisk"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "udmurtisk"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ukrainsk"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "vietnamesisk"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "forenklet kinesisk"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "traditionelt kinesisk"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Site Maps"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Static Files"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Syndication"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Web Design"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Indtast en gyldig værdi."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Indtast en gyldig URL."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr "Indtast et gyldigt heltal."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Indtast en gyldig e-mail-adresse."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Indtast en \"slug\" bestående af bogstaver, cifre, understreger og "
"bindestreger."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Indtast en gyldig IPv4-adresse."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Indtast en gyldig IPv6-adresse."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Indtast en gyldig IPv4- eller IPv6-adresse."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Indtast kun cifre adskilt af kommaer."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Denne værdi skal være %(limit_value)s (den er %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Denne værdi skal være mindre end eller lig %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Denne værdi skal være større end eller lig %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -409,7 +442,7 @@
msgstr[1] ""
"Denne værdi skal have mindst %(limit_value)d tegn (den har %(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -422,259 +455,268 @@
msgstr[1] ""
"Denne værdi må højst have %(limit_value)d tegn (den har %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s skal være unik for %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "og"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s med dette %(field_label)s eksisterer allerede."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s med dette %(field_labels)s eksisterer allerede."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr "Værdien %(value)r er ikke et gyldigt valg."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Dette felt kan ikke være null."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Dette felt kan ikke være tomt."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s med dette %(field_label)s eksisterer allerede."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s skal være unik for %(date_field_label)s %(lookup_type)s."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Felt af type: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Heltal"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr "'%(value)s' værdien skal være et heltal."
+msgstr "'%(value)s'-værdien skal være et heltal."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr "'%(value)s' værdien skal være enten True eller False."
+msgstr "'%(value)s'-værdien skal være enten True eller False."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boolsk (enten True eller False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Streng (op til %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Kommaseparerede heltal"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-"'%(value)s' værdien har et ugyldigt datoformat. Den skal være i formatet "
+"'%(value)s'-værdien har et ugyldigt datoformat. Den skal være i formatet "
"ÅÅÅÅ-MM-DD."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-"'%(value)s' værdien har det korrekte format (ÅÅÅÅ-MM-DD) men er en ugyldig "
+"'%(value)s'-værdien har det korrekte format (ÅÅÅÅ-MM-DD) men er en ugyldig "
"dato."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Dato (uden tid)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-"'%(value)s' værdien har et ugyldigt format. Den skal være i formatet ÅÅÅÅ-MM-"
+"'%(value)s'-værdien har et ugyldigt format. Den skal være i formatet ÅÅÅÅ-MM-"
"DD TT:MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-"'%(value)s' værdien har det korrekte format (ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]"
+"'%(value)s'-værdien har det korrekte format (ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]"
"[TZ]) men er en ugyldig dato/tid."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Dato (med tid)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
-msgstr "'%(value)s' værdien skal være et decimaltal."
+msgstr "'%(value)s'-værdien skal være et decimaltal."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Decimaltal"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "E-mail-adresse"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Sti"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
-msgstr "'%(value)s' værdien skal være en float."
+msgstr "'%(value)s'-værdien skal være en float (et kommatal)."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Flydende-komma-tal"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Stort heltal (8 byte)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4-adresse"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP-adresse"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr "'%(value)s' værdien skal være enten None, True eller False."
+msgstr "'%(value)s'-værdien skal være enten None, True eller False."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boolsk (True, False eller None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Positivt heltal"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Positivt lille heltal"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "\"Slug\" (op til %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Lille heltal"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-"'%(value)s' værdien har et ugyldigt format. Den skal være i formatet TT:MM[:"
+"'%(value)s'-værdien har et ugyldigt format. Den skal være i formatet TT:MM[:"
"ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-"'%(value)s' værdien har det korrekte format (TT:MM[:ss[.uuuuuu]]) men er et "
+"'%(value)s'-værdien har det korrekte format (TT:MM[:ss[.uuuuuu]]) men er et "
"ugyldigt tidspunkt."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Tid"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Rå binære data"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Fil"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Billede"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
-msgstr "%(model)s instansen med primærnøgle %(pk)r findes ikke."
+msgstr "%(model)s-instansen med primærnøgle %(pk)r findes ikke."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Fremmednøgle (type bestemt af relateret felt)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "En-til-en-relation"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Mange-til-mange-relation"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Dette felt er påkrævet."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Indtast et heltal."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Indtast et tal."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "Der må maksimalt være %(max)s ciffer i alt."
msgstr[1] "Der må maksimalt være %(max)s cifre i alt."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] "Der må maksimalt være %(max)s decimal."
msgstr[1] "Der må maksimalt være %(max)s decimaler."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -683,31 +725,31 @@
msgstr[0] "Der må maksimalt være %(max)s ciffer før kommaet."
msgstr[1] "Der må maksimalt være %(max)s cifre før kommaet."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Indtast en gyldig dato."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Indtast en gyldig tid."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Indtast gyldig dato/tid."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ingen fil blev indsendt. Kontroller kodningstypen i formularen."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Ingen fil blev indsendt."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Den indsendte fil er tom."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -715,13 +757,13 @@
msgstr[0] "Dette filnavn må højst have %(max)d tegn (det har %(length)d)."
msgstr[1] "Dette filnavn må højst have %(max)d tegn (det har %(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Du skal enten indsende en fil eller afmarkere afkrydsningsfeltet, ikke begge "
"dele."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -729,23 +771,27 @@
"Indsend en billedfil. Filen, du indsendte, var enten ikke et billede eller "
"en defekt billedfil."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Marker en gyldig valgmulighed. %(value)s er ikke en af de tilgængelige "
"valgmuligheder."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Indtast en liste af værdier."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Indtast en komplet værdi."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(Skjult felt %(name)s) %(error)s"
@@ -753,40 +799,47 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr "ManagementForm-data mangler eller er blevet manipuleret"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "Send venligst %d eller færre formularer."
msgstr[1] "Send venligst %d eller færre formularer."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Send venligst %d eller flere formularer."
+msgstr[1] "Send venligst %d eller flere formularer."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Rækkefølge"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Slet"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ret venligst duplikerede data for %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Ret venligst de duplikerede data for %(field)s, som skal være unik."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -795,33 +848,33 @@
"Ret venligst de duplikerede data for %(field_name)s, som skal være unik for "
"%(lookup)s i %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Ret venligst de duplikerede data herunder."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Den indlejrede fremmednøgle passede ikke med forælderinstansens primærnøgle."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Marker en gyldig valgmulighed. Det valg, du har foretaget, er ikke blandt de "
"tilgængelige valgmuligheder."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" er ikke en gyldig værdi for en primærnøgle."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Hold \"Ctrl\" (eller \"Æbletasten\" på Mac) nede for at vælge mere end en."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -830,15 +883,15 @@
"%(datetime)s kunne ikke fortolkes i tidszonen %(current_timezone)s; den kan "
"være tvetydig eller den eksisterer måske ikke."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Aktuelt"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Ret"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Afmarkér"
@@ -854,63 +907,63 @@
msgid "No"
msgstr "Nej"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "ja,nej,måske"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "midnat"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "middag"
@@ -1186,117 +1239,145 @@
msgid "December"
msgstr "december"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "Hverken Pillow eller PIL kunne importeres: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "PIL-modulet '_imaging' kunne ikke importeres: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "Dette er ikke en gyldig IPv6-adresse."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "eller"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d år"
msgstr[1] "%d år"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d måned"
msgstr[1] "%d måneder"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d uge"
msgstr[1] "%d uger"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dag"
msgstr[1] "%d dage"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d time"
msgstr[1] "%d timer"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minut"
msgstr[1] "%d minutter"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minutter"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Mappeindekser er ikke tilladte her"
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Forbudt"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "CSRF-verifikationen mislykkedes. Forespørgslen blev afbrudt."
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\" %(path)s\" eksisterer ikke"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Du ser denne besked fordi denne HTTPS-webside påkræver at din browser sender "
+"en 'Referer header', men den blev ikke sendt. Denne header er påkrævet af "
+"sikkerhedsmæssige grunde for at sikre at din browser ikke bliver kapret af "
+"tredjepart."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Indeks for %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Hvis du har opsat din browser til ikke at sende 'Referer' headere, beder vi "
+"dig slå dem til igen, i hvert fald for denne webside, eller for HTTPS-"
+"forbindelser, eller for 'same-origin'-forespørgsler."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Du ser denne besked fordi denne webside kræver en CSRF-cookie, når du sender "
+"formularer. Denne cookie er påkrævet af sikkerhedsmæssige grunde for at "
+"sikre at din browser ikke bliver kapret af tredjepart."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Hvis du har slået cookies fra i din browser, beder vi dig slå dem til igen, "
+"i hvert fald for denne webside, eller for 'same-origin'-forespørgsler."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Mere information er tilgængeligt med DEBUG=True."
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Intet år specificeret"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Ingen måned specificeret"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Ingen dag specificeret"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Ingen uge specificeret"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Ingen %(verbose_name_plural)s til rådighed"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1305,7 +1386,7 @@
"Fremtidige %(verbose_name_plural)s ikke tilgængelige, fordi %(class_name)s ."
"allow_future er falsk."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Ugyldig datostreng ' %(datestr)s ' givet format ' %(format)s '"
@@ -1315,16 +1396,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Ingen %(verbose_name)s fundet matcher forespørgslen"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Side er ikke 'sidste', kan heller ikke konverteres til en int."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Ugyldig side (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Tom liste og ' %(class_name)s .allow_empty' er falsk."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Mappeindekser er ikke tilladte her"
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\" %(path)s\" eksisterer ikke"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indeks for %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/de/formats.py python-django-1.7.4/django/conf/locale/de/formats.py
--- python-django-1.6.6/django/conf/locale/de/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/de/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,7 +12,7 @@
MONTH_DAY_FORMAT = 'j. F'
SHORT_DATE_FORMAT = 'd.m.Y'
SHORT_DATETIME_FORMAT = 'd.m.Y H:i:s'
-FIRST_DAY_OF_WEEK = 1 # Monday
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
@@ -22,7 +22,7 @@
)
DATETIME_INPUT_FORMATS = (
'%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
- '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
+ '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
'%d.%m.%Y %H:%M', # '25.10.2006 14:30'
'%d.%m.%Y', # '25.10.2006'
)
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/de/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/de/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/de/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/de/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/de/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/de/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -1,17 +1,17 @@
# This file is distributed under the same license as the Django package.
#
# Translators:
-# André Hagenbruch , 2011-2012
-# apollo13 , 2011
-# Jannis , 2011,2013
-# Jannis Leidel , 2013
+# André Hagenbruch, 2011-2012
+# Florian Apolloner , 2011
+# Jannis Vajen, 2011,2013
+# Jannis Leidel , 2013-2014
# Markus Holtermann , 2013
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-10-23 08:22+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-09-30 15:02+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
"de/)\n"
@@ -30,6 +30,10 @@
msgstr "Arabisch"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "Asturisch"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Aserbaidschanisch"
@@ -82,322 +86,350 @@
msgstr "Englisch"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "Australisches Englisch"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Britisches Englisch"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Spanisch"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Argentinisches Spanisch"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Mexikanisches Spanisch"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Nicaraguanisches Spanisch"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Venezolanisches Spanisch"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estnisch"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Baskisch"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persisch"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finnisch"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Französisch"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Friesisch"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Irisch"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galicisch"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebräisch"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Kroatisch"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Ungarisch"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonesisch"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr "Ido"
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Isländisch"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Italienisch"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japanisch"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Georgisch"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kasachisch"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Koreanisch"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Luxemburgisch"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Litauisch"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Lettisch"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Mazedonisch"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongolisch"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr "Marathi"
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "Birmanisch"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Norwegisch (Bokmål)"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepali"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Holländisch"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Norwegisch (Nynorsk)"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "Ossetisch"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Panjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Polnisch"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugiesisch"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Brasilianisches Portugiesisch"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Rumänisch"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Russisch"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slowakisch"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Slowenisch"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albanisch"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbisch"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serbisch (Latein)"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Schwedisch"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamilisch"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telugisch"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Thailändisch"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Türkisch"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatarisch"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Udmurtisch"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ukrainisch"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vietnamesisch"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Vereinfachtes Chinesisch"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Traditionelles Chinesisch"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Sitemaps"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Statische Dateien"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Syndication"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Webdesign"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Bitte einen gültigen Wert eingeben."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Bitte eine gültige Adresse eingeben."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr "Bitte eine gültige Ganzzahl eingeben."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Bitte gültige E-Mail-Adresse eingeben."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Bitte ein gültiges Kürzel, bestehend aus Buchstaben, Ziffern, Unter- und "
"Bindestrichen, eingeben."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Bitte eine gültige IPv4-Adresse eingeben."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Eine gültige IPv6-Adresse eingeben."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Eine gültige IPv4- oder IPv6-Adresse eingeben"
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Bitte nur durch Komma getrennte Ziffern eingeben."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Bitte sicherstellen, dass der Wert %(limit_value)s ist. (Er ist "
"%(show_value)s)"
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Dieser Wert muss kleiner oder gleich %(limit_value)s sein."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Dieser Wert muss größer oder gleich %(limit_value)s sein."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -412,7 +444,7 @@
"Bitte sicherstellen, dass der Wert aus mindestens %(limit_value)d Zeichen "
"besteht. (Er besteht aus %(show_value)d Zeichen)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -427,244 +459,253 @@
"Bitte sicherstellen, dass der Wert aus höchstens %(limit_value)d Zeichen "
"besteht. (Er besteht aus %(show_value)d Zeichen)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s muss für %(date_field)s %(lookup)s eindeutig sein."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "und"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s mit diesem %(field_label)s existiert bereits."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s mit diesem %(field_labels)s existiert bereits."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
-msgstr "Der Wert %(value)r ist keine gültige Auswahl."
+msgstr "Wert %(value)r ist keine gültige Option."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Dieses Feld darf nicht null sein."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Dieses Feld darf nicht leer sein."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s mit diesem %(field_label)s existiert bereits."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s muss für %(date_field_label)s %(lookup_type)s eindeutig sein."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Feldtyp: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Ganzzahl"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr "'%(value)s' Wert muss eine Ganzzahl sein."
+msgstr "‚%(value)s‛ Wert muss eine Ganzzahl sein."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr "'%(value)s' Wert muss entweder True oder False sein."
+msgstr "‚%(value)s‛ Wert muss entweder True oder False sein."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boolescher Wert (True oder False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Kommaseparierte Liste von Ganzzahlen"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-"'%(value)s' Wert hat ein ungültiges Datumsformat. Es muss der Form YYYY-MM-"
-"DD entsprechen."
+"‚%(value)s‛ Wert hat ein ungültiges Datumsformat. Es muss YYYY-MM-DD "
+"entsprechen."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-"'%(value)s' hat das korrekte Format (YYYY-MM-DD), aber ein ungültiges Datum."
+"‚%(value)s‛ hat das korrekte Format (YYYY-MM-DD) aber ein ungültiges Datum."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Datum (ohne Uhrzeit)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-"'%(value)s' Wert hat ein ungültiges Format. Es muss der Form YYYY-MM-DD HH:MM"
-"[:ss[.uuuuuu]][TZ] entsprechen."
+"‚%(value)s‛ Wert hat ein ungültiges Format. Es muss YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] entsprechen."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-"'%(value)s' Wert hat das korrekte Format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
-"[TZ]), aber eine ungültige Datum-/Zeitsangabe."
+"‚%(value)s‛ Wert hat das korrekte Format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) aber eine ungültige Zeit-/Datumsangabe."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Datum (mit Uhrzeit)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
-msgstr "'%(value)s' Wert muss eine Dezimalzahl sein."
+msgstr "‚%(value)s‛ Wert muss eine Dezimalzahl sein."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Dezimalzahl"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "E-Mail-Adresse"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Dateipfad"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
-msgstr "'%(value)s' Wert muss eine Gleitkommazahl sein."
+msgstr "‚%(value)s‛ Wert muss eine Fließkommazahl sein."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Gleitkommazahl"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Große Ganzzahl (8 Byte)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4-Adresse"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP-Adresse"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr "'%(value)s' Wert muss entweder None, True oder False sein."
+msgstr "‚%(value)s‛ Wert muss entweder None, True oder False sein."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boolescher Wert (True, False oder None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Positive Ganzzahl"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Positive kleine Ganzzahl"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Kürzel (bis zu %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Kleine Ganzzahl"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-"'%(value)s' Wert hat ein ungültiges Format. Es muss HH:MM[:ss[.uuuuuu]] "
+"‚%(value)s‛ Wert hat ein ungültiges Format. Es muss HH:MM[:ss[.uuuuuu]] "
"entsprechen."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-"'%(value)s' Wert hat das korrekte Format (HH:MM[:ss[.uuuuuu]]), aber ist "
-"eine ungültige Zeitangabe."
+"‚%(value)s‛ Wert hat das korrekte Format (HH:MM[:ss[.uuuuuu]]) aber ist eine "
+"ungültige Zeitangabe."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Zeit"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "Adresse (URL)"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Binärdaten"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Datei"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Bild"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
-msgstr "Objekt vom Typ %(model)s mit Primärschlüssel %(pk)r existiert nicht."
+msgstr "%(model)s-Instanz mit Primärschlüssel %(pk)r existiert nicht."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Fremdschlüssel (Typ definiert durch verknüpftes Feld)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "1:1-Beziehung"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "n:m-Beziehung"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Dieses Feld ist zwingend erforderlich."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Bitte eine ganze Zahl eingeben."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Bitte eine Zahl eingeben."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
@@ -673,7 +714,7 @@
msgstr[1] ""
"Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffern enthält."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
@@ -682,7 +723,7 @@
msgstr[1] ""
"Bitte sicherstellen, dass der Wert höchstens %(max)s Dezimalstellen enthält."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -695,32 +736,32 @@
"Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffern vor dem Komma "
"enthält."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Bitte ein gültiges Datum eingeben."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Bitte eine gültige Uhrzeit eingeben."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Bitte ein gültiges Datum und Uhrzeit eingeben."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Es wurde keine Datei übertragen. Überprüfen Sie das Encoding des Formulars."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Es wurde keine Datei übertragen."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Die übertragene Datei ist leer."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -732,13 +773,13 @@
"Bitte sicherstellen, dass der Dateiname aus höchstens %(max)d Zeichen "
"besteht. (Er besteht aus %(length)d Zeichen)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Bitte wählen Sie entweder eine Datei aus oder wählen Sie \"Löschen\", nicht "
"beides."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -746,22 +787,26 @@
"Bitte ein gültiges Bild hochladen. Die hochgeladene Datei ist kein Bild oder "
"ist defekt."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Bitte eine gültige Auswahl treffen. %(value)s ist keine gültige Auswahl."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Bitte eine Liste mit Werten eingeben."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Bitte einen vollständigen Wert eingeben."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(Verstecktes Feld %(name)s) %(error)s"
@@ -769,41 +814,48 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr "ManagementForm-Daten fehlen oder wurden manipuliert."
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "Bitte höchstens %d Formular abschicken."
msgstr[1] "Bitte höchstens %d Formulare abschicken."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Bitte %d oder mehr Formulare abschicken."
+msgstr[1] "Bitte %d oder mehr Formulare abschicken."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Reihenfolge"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Löschen"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Bitte die doppelten Daten für %(field)s korrigieren."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Bitte die doppelten Daten für %(field)s korrigieren, das eindeutig sein muss."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -812,33 +864,33 @@
"Bitte die doppelten Daten für %(field_name)s korrigieren, da es für "
"%(lookup)s in %(date_field)s eindeutig sein muss."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Bitte die unten aufgeführten doppelten Werte korrigieren."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Der Inline-Fremdschlüssel passt nicht zum Primärschlüssel der übergeordneten "
"Instanz."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Bitte eine gültige Auswahl treffen. Dies ist keine gültige Auswahl."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" ist kein gültiger Wert für einen Primärschlüssel."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Strg-Taste (⌘ für Mac) während des Klickens gedrückt halten, um mehrere "
"Einträge auszuwählen."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -847,15 +899,15 @@
"%(datetime)s konnte mit der Zeitzone %(current_timezone)s nicht eindeutig "
"interpretiert werden, da es doppeldeutig oder eventuell inkorrekt ist."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Derzeit"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Ändern"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Zurücksetzen"
@@ -871,63 +923,63 @@
msgid "No"
msgstr "Nein"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "Ja,Nein,Vielleicht"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d Byte"
msgstr[1] "%(size)d Bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "nachm."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "vorm."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "nachm."
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "vorm."
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "Mitternacht"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "Mittag"
@@ -1203,117 +1255,147 @@
msgid "December"
msgstr "Dezember"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "Weder Pillow noch PIL konnten importiert werden: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "Das '_imaging' Modul von PIL konnte nicht importiert werden: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "Dies ist keine gültige IPv6-Adresse."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "oder"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d Jahr"
msgstr[1] "%d Jahre"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d Monat"
msgstr[1] "%d Monate"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d Woche"
msgstr[1] "%d Wochen"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d Tag"
msgstr[1] "%d Tage"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d Stunde"
msgstr[1] "%d Stunden"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d Minute"
msgstr[1] "%d Minuten"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 Minuten"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Dateilisten sind untersagt."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Verboten"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "CSRF-Verifizierung fehlgeschlagen. Anfrage abgebrochen."
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" ist nicht vorhanden"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Sie sehen diese Fehlermeldung da diese HTTPS-Seite einen „Referer“-Header "
+"von Ihrem Webbrowser erwartet, aber keinen erhalten hat. Dieser Header ist "
+"aus Sicherheitsgründen notwendig, um sicherzustellen, dass Ihr Webbrowser "
+"nicht von Dritten missbraucht wird."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Verzeichnis %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Falls Sie Ihren Webbrowser so konfiguriert haben, dass „Referer“-Header "
+"nicht gesendet werden, müssen Sie diese Funktion mindestens für diese Seite, "
+"für sichere HTTPS-Verbindungen oder für „Same-Origin“-Verbindungen "
+"reaktivieren."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Sie sehen Diese Nachricht, da diese Seite einen CSRF-Cookie beim Verarbeiten "
+"von Formulardaten benötigt. Dieses Cookie ist aus Sicherheitsgründen "
+"notwendig, um sicherzustellen, dass Ihr Webbrowser nicht von Dritten "
+"missbraucht wird."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Falls Sie Cookies in Ihren Webbrowser deaktiviert haben, müssen Sie sie "
+"midestens für diese Seite oder für „Same-Origin“-Verbindungen reaktivieren."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Mehr Information ist verfügbar mit DEBUG=True."
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Kein Jahr angegeben"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Kein Monat angegeben"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Kein Tag angegeben"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Keine Woche angegeben"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Keine %(verbose_name_plural)s verfügbar"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1322,7 +1404,7 @@
"In der Zukunft liegende %(verbose_name_plural)s sind nicht verfügbar, da "
"%(class_name)s.allow_future auf False gesetzt ist."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Ungültiges Datum '%(datestr)s' für das Format '%(format)s'"
@@ -1332,18 +1414,32 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Konnte keine %(verbose_name)s mit diesen Parametern finden."
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Weder ist dies die letzte Seite ('last') noch konnte sie in einen "
"ganzzahligen Wert umgewandelt werden."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Ungültige Seite (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Leere Liste und '%(class_name)s.allow_empty' ist False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Dateilisten sind untersagt."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ist nicht vorhanden"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Verzeichnis %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/de_CH/formats.py python-django-1.7.4/django/conf/locale/de_CH/formats.py
--- python-django-1.6.6/django/conf/locale/de_CH/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/de_CH/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -13,7 +13,7 @@
MONTH_DAY_FORMAT = 'j. F'
SHORT_DATE_FORMAT = 'd.m.Y'
SHORT_DATETIME_FORMAT = 'd.m.Y H:i:s'
-FIRST_DAY_OF_WEEK = 1 # Monday
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
@@ -23,7 +23,7 @@
)
DATETIME_INPUT_FORMATS = (
'%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
- '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
+ '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
'%d.%m.%Y %H:%M', # '25.10.2006 14:30'
'%d.%m.%Y', # '25.10.2006'
)
@@ -34,5 +34,5 @@
# For details, please refer to http://www.bk.admin.ch/dokumentation/sprachen/04915/05016/index.html?lang=de
# (in German) and the documentation
DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = '\xa0' # non-breaking space
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
NUMBER_GROUPING = 3
diff -Nru python-django-1.6.6/django/conf/locale/el/formats.py python-django-1.7.4/django/conf/locale/el/formats.py
--- python-django-1.6.6/django/conf/locale/el/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/el/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -5,20 +5,34 @@
# The *_FORMAT strings use the Django date format syntax,
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = 'd E Y'
-TIME_FORMAT = 'g:i:s A'
-# DATETIME_FORMAT =
+DATE_FORMAT = 'd/m/Y'
+TIME_FORMAT = 'P'
+DATETIME_FORMAT = 'd/m/Y P'
YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j F'
-SHORT_DATE_FORMAT = 'd M Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+SHORT_DATE_FORMAT = 'd/m/Y'
+SHORT_DATETIME_FORMAT = 'd/m/Y P'
+FIRST_DAY_OF_WEEK = 0 # Sunday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+DATE_INPUT_FORMATS = (
+ '%d/%m/%Y', '%d/%m/%y', '%Y-%m-%d', # '25/10/2006', '25/10/06', '2006-10-25',
+)
+DATETIME_INPUT_FORMATS = (
+ '%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'
+ '%d/%m/%Y %H:%M:%S.%f', # '25/10/2006 14:30:59.000200'
+ '%d/%m/%Y %H:%M', # '25/10/2006 14:30'
+ '%d/%m/%Y', # '25/10/2006'
+ '%d/%m/%y %H:%M:%S', # '25/10/06 14:30:59'
+ '%d/%m/%y %H:%M:%S.%f', # '25/10/06 14:30:59.000200'
+ '%d/%m/%y %H:%M', # '25/10/06 14:30'
+ '%d/%m/%y', # '25/10/06'
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M:%S.%f', # '2006-10-25 14:30:59.000200'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+)
DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
+NUMBER_GROUPING = 3
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/el/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/el/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/el/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/el/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/el/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/el/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -1,17 +1,20 @@
# This file is distributed under the same license as the Django package.
#
# Translators:
-# Apostolos Mpessas , 2013
+# Apostolis Bessas , 2013
# Dimitris Glezos , 2011,2013
# Jannis Leidel , 2011
+# nikolas demiridis , 2014
+# Panos Laganakos , 2014
+# Stavros Korokithakis , 2014
# Yorgos Pagles , 2011-2012
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
-"Last-Translator: Jannis Leidel \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 09:14+0000\n"
+"Last-Translator: Panos Laganakos \n"
"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
"el/)\n"
"MIME-Version: 1.0\n"
@@ -22,13 +25,17 @@
#: conf/global_settings.py:51
msgid "Afrikaans"
-msgstr ""
+msgstr "Αφρικάνς"
#: conf/global_settings.py:52
msgid "Arabic"
msgstr "Αραβικά"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "Αστούριας"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Γλώσσα Αζερμπαϊτζάν"
@@ -38,7 +45,7 @@
#: conf/global_settings.py:55
msgid "Belarusian"
-msgstr ""
+msgstr "Λευκορώσικα"
#: conf/global_settings.py:56
msgid "Bengali"
@@ -46,7 +53,7 @@
#: conf/global_settings.py:57
msgid "Breton"
-msgstr ""
+msgstr "Βρετονικά"
#: conf/global_settings.py:58
msgid "Bosnian"
@@ -81,321 +88,349 @@
msgstr "Αγγλικά"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "Αγγλικά Αυστραλίας"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Αγγλικά Βρετανίας"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Εσπεράντο"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Ισπανικά"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Ισπανικά Αργεντινής"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Μεξικανική διάλεκτος Ισπανικών"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Ισπανικά Νικαράγουας "
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
-msgstr ""
+msgstr "Ισπανικά Βενεζουέλας"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Εσθονικά"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Βάσκικα"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Περσικά"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Φινλανδικά"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Γαλλικά"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frisian"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Ιρλανδικά"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Γαελικά"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Εβραϊκά"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Ινδικά"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Κροατικά"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Ουγγρικά"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
-msgstr ""
+msgstr "Ιντερλίνγκουα"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Ινδονησιακά"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Ισλανδικά"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Ιταλικά"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Γιαπωνέζικα"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Γεωργιανά"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Καζακστά"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Χμερ"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Κανάντα"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Κορεάτικα"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
-msgstr ""
+msgstr "Λουξεμβουργιανά"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Λιθουανικά"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Λεττονικά"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Μακεδονικά"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Μαλαγιαλάμ"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Μογγολικά"
-#: conf/global_settings.py:101
-msgid "Burmese"
-msgstr ""
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr "Μαράθι"
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr "Βιρμανικά"
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Νορβηγική διάλεκτος Μποκμάλ - \"γλώσσα των βιβλίων\""
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
-msgstr ""
+msgstr "Νεπαλέζικα"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Ολλανδικά"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Νορβηγική διάλεκτος Nynorsk - Νεονορβηγική"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
-msgstr ""
+msgstr "Οσσετικά"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Πουντζάμπι"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Πολωνικά"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Πορτογαλικά"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Πορτογαλικά - διάλεκτος Βραζιλίας"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Ρουμανικά"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Ρωσικά"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Σλοβακικά"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Σλοβενικά"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Αλβανικά"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Σερβικά"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Σέρβικα Λατινικά"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Σουηδικά"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
-msgstr ""
+msgstr "Σουαχίλι"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Διάλεκτος Ταμίλ"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Τελούγκου"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Ταϊλάνδης"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Τουρκικά"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
-msgstr ""
+msgstr "Ταταρικά"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
-msgstr ""
+msgstr "Ουντμουρτικά"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ουκρανικά"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Βιετναμέζικα"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Απλοποιημένα Κινέζικα"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Παραδοσιακά Κινέζικα"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Χάρτες Ιστότοπου"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Στατικά Αρχεία"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Σχεδιασμός Ιστοσελίδων"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Εισάγετε μια έγκυρη τιμή."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Εισάγετε ένα έγκυρο URL."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr ""
+msgstr "Εισάγετε έναν έγκυρο ακέραιο."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδρομείου."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Ένα έγκυρο 'slug' αποτελείται από γράμματα, αριθμούς, παύλες ή κάτω παύλες."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Εισάγετε μια έγκυρη διεύθυνση IPv4."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Εισάγετε μία έγκυρη IPv6 διεύθυνση"
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Εισάγετε μία έγκυρη IPv4 ή IPv6 διεύθυνση"
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Εισάγετε μόνο ψηφία χωρισμένα με κόμματα."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Βεβαιωθείτε ότι η τιμή είναι %(limit_value)s (η τιμή που καταχωρήσατε είναι "
"%(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Βεβαιωθείτε ότι η τιμή είναι μικρότερη ή ίση από %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Βεβαιωθείτε ότι η τιμή είναι μεγαλύτερη ή ίση από %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -406,7 +441,7 @@
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -417,250 +452,259 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-" %(field_name)s πρέπει να είναι μοναδικό για %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "και"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s με αυτό το %(field_label)s υπάρχει ήδη."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s με αυτή την %(field_labels)s υπάρχει ήδη."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
-msgstr ""
+msgstr "Η τιμή %(value)r δεν είναι έγκυρη επιλογή."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Αυτό το πεδίο δεν μπορεί να είναι κενό (null)."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Το πεδίο αυτό δεν μπορεί να είναι κενό."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s με αυτό το %(field_label)s υπάρχει ήδη."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Είδος πεδίου: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Ακέραιος"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr ""
+msgstr "Η τιμή '%(value)s' πρέπει να είναι ακέραιος."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr ""
+msgstr "Η τιμή '%(value)s' πρέπει να είναι είτε True ή False."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boolean (Είτε Αληθές ή Ψευδές)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Συμβολοσειρά (μέχρι %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Ακέραιοι χωρισμένοι με κόμματα"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Ημερομηνία (χωρίς την ώρα)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Ημερομηνία (με την ώρα)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
-msgstr ""
+msgstr "Η '%(value)s' τιμή πρέπει να είναι ακέραιος."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Δεκαδικός αριθμός"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Ηλεκτρονική διεύθυνση"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Τοποθεσία αρχείου"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
-msgstr ""
+msgstr "Η '%(value)s' τιμή πρέπει να είναι δεκαδικός."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Αριθμός κινητής υποδιαστολής"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Μεγάλος ακέραιος - big integer (8 bytes)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Διεύθυνση IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "διεύθυνση IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr ""
+msgstr "Η '%(value)s' τιμή πρέπει είναι είτε None, True ή False."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (Αληθές, Ψευδές, ή τίποτα)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Θετικός ακέραιος"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Θετικός μικρός ακέραιος"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Slug (μέχρι %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Μικρός ακέραιος"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Κείμενο"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Ώρα"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Αρχείο"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Εικόνα"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr ""
"Εξωτερικό Κλειδί - Foreign Key (ο τύπος καθορίζεται από το πεδίο του "
"συσχετισμού)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Σχέση ένα-προς-ένα"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Σχέση πολλά-προς-πολλά"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Αυτό το πεδίο είναι απαραίτητο."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Εισάγετε έναν ακέραιο αριθμό."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Εισάγετε έναν αριθμό."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
+"Σιγουρευτείτε οτι τα σύνολο των ψηφίων δεν είναι παραπάνω από %(max)s"
msgstr[1] ""
+"Σιγουρευτείτε οτι τα σύνολο των ψηφίων δεν είναι παραπάνω από %(max)s"
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Σιγουρευτείτε ότι το δεκαδικό ψηφίο δεν είναι παραπάνω από %(max)s."
+msgstr[1] "Σιγουρευτείτε ότι τα δεκαδικά ψηφία δεν είναι παραπάνω από %(max)s."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -669,32 +713,32 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Εισάγετε μια έγκυρη ημερομηνία."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Εισάγετε μια έγκυρη ώρα."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Εισάγετε μια έγκυρη ημερομηνία/ώρα."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Δεν έχει υποβληθεί κάποιο αρχείο. Ελέγξτε τον τύπο κωδικοποίησης στη φόρμα."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Δεν έχει υποβληθεί κάποιο αρχείο."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Το αρχείο που υποβλήθηκε είναι κενό."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -702,14 +746,14 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Βεβαιωθείτε ότι είτε έχετε επιλέξει ένα αρχείο για αποστολή είτε έχετε "
"επιλέξει την εκκαθάριση του πεδίου. Δεν είναι δυνατή η επιλογή και των δύο "
"ταυτοχρόνως."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -717,23 +761,27 @@
"Βεβεαιωθείτε ότι το αρχείο που έχετε επιλέξει για αποστολή είναι αρχείο "
"εικόνας. Το τρέχον είτε δεν ήταν εικόνα είτε έχει υποστεί φθορά."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Βεβαιωθείτε ότι έχετε επιλέξει μία έγκυρη επιλογή. Η τιμή %(value)s δεν "
"είναι διαθέσιμη προς επιλογή."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Εισάγετε μια λίστα τιμών."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Εισάγετε μια πλήρης τιμή"
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
-msgstr ""
+msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -741,42 +789,49 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
-msgstr ""
+msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
+msgstr "Τα δεδομένα του ManagementForm λείπουν ή έχουν αλλοιωθεί"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Παρακαλώ υποβάλλετε %d ή λιγότερες φόρμες."
+msgstr[1] "Παρακαλώ υποβάλλετε %d ή λιγότερες φόρμες."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Παρακαλώ υποβάλλετε %d ή περισσότερες φόρμες."
+msgstr[1] "Παρακαλώ υποβάλλετε %d ή περισσότερες φόρμες."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ταξινόμηση"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Διαγραφή"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Στο %(field)s έχετε ξαναεισάγει τα ίδια δεδομένα."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Στο %(field)s έχετε ξαναεισάγει τα ίδια δεδομένα. Θα πρέπει να εμφανίζονται "
"μία φορά. "
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -785,50 +840,50 @@
"Στο %(field_name)s έχετε ξαναεισάγει τα ίδια δεδομένα. Θα πρέπει να "
"εμφανίζονται μία φορά για το %(lookup)s στο %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Έχετε ξαναεισάγει την ίδια τιμη. Βεβαιωθείτε ότι είναι μοναδική."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Το ενσωματωμένο εξωτερικό κλειδί δεν αντιστοιχεί με το κλειδί του "
"αντικειμένου από το οποίο πηγάζει."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Επιλέξτε μια έγκυρη επιλογή. Η επιλογή αυτή δεν είναι μία από τις διαθέσιμες "
"επιλογές."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "Το \"%(pk)s\" δεν είναι έγκυρη τιμή για πρωτεύων κλειδί"
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Κρατήστε πατημένο το πλήκτρο \"Control\" ή σε Mac το πλήκτρο \"Command\" για "
"να επιλέξετε περισσότερα από ένα."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Τώρα"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Επεξεργασία"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Εκκαθάσριση"
@@ -844,63 +899,63 @@
msgid "No"
msgstr "Όχι"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "ναι,όχι,ίσως"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bytes"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "μμ."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "πμ."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "ΜΜ"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "ΠΜ"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "μεσάνυχτα"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "μεσημέρι"
@@ -1176,117 +1231,133 @@
msgid "December"
msgstr "Δεκεμβρίου"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr ""
+msgstr "Αυτή δεν είναι έγκυρη διεύθυνση IPv6."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "ή"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d χρόνος"
+msgstr[1] "%d χρόνια"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d μήνας"
+msgstr[1] "%d μήνες"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d βδομάδα"
+msgstr[1] "%d βδομάδες"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d μέρα"
+msgstr[1] "%d μέρες"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ώρα"
+msgstr[1] "%d ώρες"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d λεπτό"
+msgstr[1] "%d λεπτά"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
+msgstr "0 λεπτά"
+
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Απαγορευμένο"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "Η πιστοποίηση CSRF απέτυχε. Το αίτημα απέτυχε"
+
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Περισσότερες πληροφορίες είναι διαθέσιμες με DEBUG=True"
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Δεν έχει οριστεί χρονιά"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Δεν έχει οριστεί μήνας"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Δεν έχει οριστεί μέρα"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Δεν έχει οριστεί εβδομάδα"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Δεν υπάρχουν διαθέσιμα %(verbose_name_plural)s"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1295,7 +1366,7 @@
"Μελλοντικά %(verbose_name_plural)s δεν είναι διαθέσιμα διότι δεν έχει τεθεί "
"το %(class_name)s.allow_future."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1307,18 +1378,32 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Δεν βρέθηκαν %(verbose_name)s που να ικανοποιούν την αναζήτηση."
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Η σελίδα δεν έχει την τιμή 'last' υποδηλώνοντας την τελευταία σελίδα, ούτε "
"μπορεί να μετατραπεί σε ακέραιο."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Άκυρη σελίδα (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Άδεια λίστα ενώ '%(class_name)s.allow_empty' δεν έχει τεθεί."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Τα ευρετήρια καταλόγων δεν επιτρέπονται εδώ."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "Το \"%(path)s\" δεν υπάρχει"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Ευρετήριο του %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/en/formats.py python-django-1.7.4/django/conf/locale/en/formats.py
--- python-django-1.6.6/django/conf/locale/en/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/en/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,13 +12,13 @@
MONTH_DAY_FORMAT = 'F j'
SHORT_DATE_FORMAT = 'm/d/Y'
SHORT_DATETIME_FORMAT = 'm/d/Y P'
-FIRST_DAY_OF_WEEK = 0 # Sunday
+FIRST_DAY_OF_WEEK = 0 # Sunday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = (
- '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
+ '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
# '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
# '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
# '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
@@ -41,4 +41,3 @@
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
NUMBER_GROUPING = 3
-
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/en/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/en/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/en/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/en/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/en/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/en/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English \n"
@@ -22,6 +22,10 @@
msgstr ""
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr ""
@@ -74,318 +78,346 @@
msgstr ""
#: conf/global_settings.py:66
-msgid "British English"
+msgid "Australian English"
msgstr ""
#: conf/global_settings.py:67
-msgid "Esperanto"
+msgid "British English"
msgstr ""
#: conf/global_settings.py:68
-msgid "Spanish"
+msgid "Esperanto"
msgstr ""
#: conf/global_settings.py:69
-msgid "Argentinian Spanish"
+msgid "Spanish"
msgstr ""
#: conf/global_settings.py:70
-msgid "Mexican Spanish"
+msgid "Argentinian Spanish"
msgstr ""
#: conf/global_settings.py:71
-msgid "Nicaraguan Spanish"
+msgid "Mexican Spanish"
msgstr ""
#: conf/global_settings.py:72
-msgid "Venezuelan Spanish"
+msgid "Nicaraguan Spanish"
msgstr ""
#: conf/global_settings.py:73
-msgid "Estonian"
+msgid "Venezuelan Spanish"
msgstr ""
#: conf/global_settings.py:74
-msgid "Basque"
+msgid "Estonian"
msgstr ""
#: conf/global_settings.py:75
-msgid "Persian"
+msgid "Basque"
msgstr ""
#: conf/global_settings.py:76
-msgid "Finnish"
+msgid "Persian"
msgstr ""
#: conf/global_settings.py:77
-msgid "French"
+msgid "Finnish"
msgstr ""
#: conf/global_settings.py:78
-msgid "Frisian"
+msgid "French"
msgstr ""
#: conf/global_settings.py:79
-msgid "Irish"
+msgid "Frisian"
msgstr ""
#: conf/global_settings.py:80
-msgid "Galician"
+msgid "Irish"
msgstr ""
#: conf/global_settings.py:81
-msgid "Hebrew"
+msgid "Galician"
msgstr ""
#: conf/global_settings.py:82
-msgid "Hindi"
+msgid "Hebrew"
msgstr ""
#: conf/global_settings.py:83
-msgid "Croatian"
+msgid "Hindi"
msgstr ""
#: conf/global_settings.py:84
-msgid "Hungarian"
+msgid "Croatian"
msgstr ""
#: conf/global_settings.py:85
-msgid "Interlingua"
+msgid "Hungarian"
msgstr ""
#: conf/global_settings.py:86
-msgid "Indonesian"
+msgid "Interlingua"
msgstr ""
#: conf/global_settings.py:87
-msgid "Icelandic"
+msgid "Indonesian"
msgstr ""
#: conf/global_settings.py:88
-msgid "Italian"
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
+msgid "Icelandic"
msgstr ""
#: conf/global_settings.py:89
-msgid "Japanese"
+msgid "Italian"
msgstr ""
#: conf/global_settings.py:90
-msgid "Georgian"
+msgid "Japanese"
msgstr ""
#: conf/global_settings.py:91
-msgid "Kazakh"
+msgid "Georgian"
msgstr ""
#: conf/global_settings.py:92
-msgid "Khmer"
+msgid "Kazakh"
msgstr ""
#: conf/global_settings.py:93
-msgid "Kannada"
+msgid "Khmer"
msgstr ""
#: conf/global_settings.py:94
-msgid "Korean"
+msgid "Kannada"
msgstr ""
#: conf/global_settings.py:95
-msgid "Luxembourgish"
+msgid "Korean"
msgstr ""
#: conf/global_settings.py:96
-msgid "Lithuanian"
+msgid "Luxembourgish"
msgstr ""
#: conf/global_settings.py:97
-msgid "Latvian"
+msgid "Lithuanian"
msgstr ""
#: conf/global_settings.py:98
-msgid "Macedonian"
+msgid "Latvian"
msgstr ""
#: conf/global_settings.py:99
-msgid "Malayalam"
+msgid "Macedonian"
msgstr ""
#: conf/global_settings.py:100
-msgid "Mongolian"
+msgid "Malayalam"
msgstr ""
#: conf/global_settings.py:101
-msgid "Burmese"
+msgid "Mongolian"
msgstr ""
#: conf/global_settings.py:102
-msgid "Norwegian Bokmal"
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
+msgid "Burmese"
msgstr ""
#: conf/global_settings.py:103
-msgid "Nepali"
+msgid "Norwegian Bokmal"
msgstr ""
#: conf/global_settings.py:104
-msgid "Dutch"
+msgid "Nepali"
msgstr ""
#: conf/global_settings.py:105
-msgid "Norwegian Nynorsk"
+msgid "Dutch"
msgstr ""
#: conf/global_settings.py:106
-msgid "Ossetic"
+msgid "Norwegian Nynorsk"
msgstr ""
#: conf/global_settings.py:107
-msgid "Punjabi"
+msgid "Ossetic"
msgstr ""
#: conf/global_settings.py:108
-msgid "Polish"
+msgid "Punjabi"
msgstr ""
#: conf/global_settings.py:109
-msgid "Portuguese"
+msgid "Polish"
msgstr ""
#: conf/global_settings.py:110
-msgid "Brazilian Portuguese"
+msgid "Portuguese"
msgstr ""
#: conf/global_settings.py:111
-msgid "Romanian"
+msgid "Brazilian Portuguese"
msgstr ""
#: conf/global_settings.py:112
-msgid "Russian"
+msgid "Romanian"
msgstr ""
#: conf/global_settings.py:113
-msgid "Slovak"
+msgid "Russian"
msgstr ""
#: conf/global_settings.py:114
-msgid "Slovenian"
+msgid "Slovak"
msgstr ""
#: conf/global_settings.py:115
-msgid "Albanian"
+msgid "Slovenian"
msgstr ""
#: conf/global_settings.py:116
-msgid "Serbian"
+msgid "Albanian"
msgstr ""
#: conf/global_settings.py:117
-msgid "Serbian Latin"
+msgid "Serbian"
msgstr ""
#: conf/global_settings.py:118
-msgid "Swedish"
+msgid "Serbian Latin"
msgstr ""
#: conf/global_settings.py:119
-msgid "Swahili"
+msgid "Swedish"
msgstr ""
#: conf/global_settings.py:120
-msgid "Tamil"
+msgid "Swahili"
msgstr ""
#: conf/global_settings.py:121
-msgid "Telugu"
+msgid "Tamil"
msgstr ""
#: conf/global_settings.py:122
-msgid "Thai"
+msgid "Telugu"
msgstr ""
#: conf/global_settings.py:123
-msgid "Turkish"
+msgid "Thai"
msgstr ""
#: conf/global_settings.py:124
-msgid "Tatar"
+msgid "Turkish"
msgstr ""
#: conf/global_settings.py:125
-msgid "Udmurt"
+msgid "Tatar"
msgstr ""
#: conf/global_settings.py:126
-msgid "Ukrainian"
+msgid "Udmurt"
msgstr ""
#: conf/global_settings.py:127
-msgid "Urdu"
+msgid "Ukrainian"
msgstr ""
#: conf/global_settings.py:128
-msgid "Vietnamese"
+msgid "Urdu"
msgstr ""
#: conf/global_settings.py:129
+msgid "Vietnamese"
+msgstr ""
+
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr ""
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr ""
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr ""
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr ""
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr ""
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -396,7 +428,7 @@
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -407,247 +439,255 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr ""
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr ""
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr ""
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr ""
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr ""
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr ""
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr ""
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr ""
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr ""
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr ""
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr ""
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr ""
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr ""
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr ""
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr ""
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr ""
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr ""
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr ""
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr ""
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr ""
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr ""
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr ""
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr ""
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -656,31 +696,31 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr ""
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr ""
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr ""
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr ""
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr ""
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -688,115 +728,126 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr ""
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr ""
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr ""
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr ""
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr ""
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr ""
@@ -812,63 +863,63 @@
msgid "No"
msgstr ""
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr ""
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr ""
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr ""
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr ""
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr ""
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr ""
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr ""
@@ -1144,124 +1195,140 @@
msgid "December"
msgstr ""
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ""
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
+#: views/csrf.py:105
+msgid "Forbidden"
msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
msgstr ""
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr ""
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr ""
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr ""
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1271,16 +1338,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
diff -Nru python-django-1.6.6/django/conf/locale/en_AU/formats.py python-django-1.7.4/django/conf/locale/en_AU/formats.py
--- python-django-1.6.6/django/conf/locale/en_AU/formats.py 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/en_AU/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+from __future__ import unicode_literals
+
+# The *_FORMAT strings use the Django date format syntax,
+# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+DATE_FORMAT = 'j M Y' # '25 Oct 2006'
+TIME_FORMAT = 'P' # '2:30 pm'
+DATETIME_FORMAT = 'j M Y, P' # '25 Oct 2006, 2:30 pm'
+YEAR_MONTH_FORMAT = 'F Y' # 'October 2006'
+MONTH_DAY_FORMAT = 'j F' # '25 October'
+SHORT_DATE_FORMAT = 'd/m/Y' # '25/10/2006'
+SHORT_DATETIME_FORMAT = 'd/m/Y P' # '25/10/2006 2:30 pm'
+FIRST_DAY_OF_WEEK = 0 # Sunday
+
+# The *_INPUT_FORMATS strings use the Python strftime format syntax,
+# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+DATE_INPUT_FORMATS = (
+ '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
+ # '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
+ # '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
+ # '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
+ # '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
+)
+DATETIME_INPUT_FORMATS = (
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M:%S.%f', # '2006-10-25 14:30:59.000200'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+ '%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'
+ '%d/%m/%Y %H:%M:%S.%f', # '25/10/2006 14:30:59.000200'
+ '%d/%m/%Y %H:%M', # '25/10/2006 14:30'
+ '%d/%m/%Y', # '25/10/2006'
+ '%d/%m/%y %H:%M:%S', # '25/10/06 14:30:59'
+ '%d/%m/%y %H:%M:%S.%f', # '25/10/06 14:30:59.000200'
+ '%d/%m/%y %H:%M', # '25/10/06 14:30'
+ '%d/%m/%y', # '25/10/06'
+)
+DECIMAL_SEPARATOR = '.'
+THOUSAND_SEPARATOR = ','
+NUMBER_GROUPING = 3
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/en_AU/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/en_AU/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/en_AU/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/en_AU/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/en_AU/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/en_AU/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -0,0 +1,1395 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Tom Fifield , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
+"Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
+"django/language/en_AU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_AU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: conf/global_settings.py:51
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: conf/global_settings.py:52
+msgid "Arabic"
+msgstr "Arabic"
+
+#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Azerbaijani"
+msgstr "Azerbaijani"
+
+#: conf/global_settings.py:54
+msgid "Bulgarian"
+msgstr "Bulgarian"
+
+#: conf/global_settings.py:55
+msgid "Belarusian"
+msgstr "Belarusian"
+
+#: conf/global_settings.py:56
+msgid "Bengali"
+msgstr "Bengali"
+
+#: conf/global_settings.py:57
+msgid "Breton"
+msgstr "Breton"
+
+#: conf/global_settings.py:58
+msgid "Bosnian"
+msgstr "Bosnian"
+
+#: conf/global_settings.py:59
+msgid "Catalan"
+msgstr "Catalan"
+
+#: conf/global_settings.py:60
+msgid "Czech"
+msgstr "Czech"
+
+#: conf/global_settings.py:61
+msgid "Welsh"
+msgstr "Welsh"
+
+#: conf/global_settings.py:62
+msgid "Danish"
+msgstr "Danish"
+
+#: conf/global_settings.py:63
+msgid "German"
+msgstr "German"
+
+#: conf/global_settings.py:64
+msgid "Greek"
+msgstr "Greek"
+
+#: conf/global_settings.py:65
+msgid "English"
+msgstr "English"
+
+#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
+msgid "British English"
+msgstr "British English"
+
+#: conf/global_settings.py:68
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: conf/global_settings.py:69
+msgid "Spanish"
+msgstr "Spanish"
+
+#: conf/global_settings.py:70
+msgid "Argentinian Spanish"
+msgstr "Argentinian Spanish"
+
+#: conf/global_settings.py:71
+msgid "Mexican Spanish"
+msgstr "Mexican Spanish"
+
+#: conf/global_settings.py:72
+msgid "Nicaraguan Spanish"
+msgstr "Nicaraguan Spanish"
+
+#: conf/global_settings.py:73
+msgid "Venezuelan Spanish"
+msgstr "Venezuelan Spanish"
+
+#: conf/global_settings.py:74
+msgid "Estonian"
+msgstr "Estonian"
+
+#: conf/global_settings.py:75
+msgid "Basque"
+msgstr "Basque"
+
+#: conf/global_settings.py:76
+msgid "Persian"
+msgstr "Persian"
+
+#: conf/global_settings.py:77
+msgid "Finnish"
+msgstr "Finnish"
+
+#: conf/global_settings.py:78
+msgid "French"
+msgstr "French"
+
+#: conf/global_settings.py:79
+msgid "Frisian"
+msgstr "Frisian"
+
+#: conf/global_settings.py:80
+msgid "Irish"
+msgstr "Irish"
+
+#: conf/global_settings.py:81
+msgid "Galician"
+msgstr "Galician"
+
+#: conf/global_settings.py:82
+msgid "Hebrew"
+msgstr "Hebrew"
+
+#: conf/global_settings.py:83
+msgid "Hindi"
+msgstr "Hindi"
+
+#: conf/global_settings.py:84
+msgid "Croatian"
+msgstr "Croatian"
+
+#: conf/global_settings.py:85
+msgid "Hungarian"
+msgstr "Hungarian"
+
+#: conf/global_settings.py:86
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:87
+msgid "Indonesian"
+msgstr "Indonesian"
+
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
+msgid "Icelandic"
+msgstr "Icelandic"
+
+#: conf/global_settings.py:89
+msgid "Italian"
+msgstr "Italian"
+
+#: conf/global_settings.py:90
+msgid "Japanese"
+msgstr "Japanese"
+
+#: conf/global_settings.py:91
+msgid "Georgian"
+msgstr "Georgian"
+
+#: conf/global_settings.py:92
+msgid "Kazakh"
+msgstr "Kazakh"
+
+#: conf/global_settings.py:93
+msgid "Khmer"
+msgstr "Khmer"
+
+#: conf/global_settings.py:94
+msgid "Kannada"
+msgstr "Kannada"
+
+#: conf/global_settings.py:95
+msgid "Korean"
+msgstr "Korean"
+
+#: conf/global_settings.py:96
+msgid "Luxembourgish"
+msgstr "Luxembourgish"
+
+#: conf/global_settings.py:97
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: conf/global_settings.py:98
+msgid "Latvian"
+msgstr "Latvian"
+
+#: conf/global_settings.py:99
+msgid "Macedonian"
+msgstr "Macedonian"
+
+#: conf/global_settings.py:100
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: conf/global_settings.py:101
+msgid "Mongolian"
+msgstr "Mongolian"
+
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr "Burmese"
+
+#: conf/global_settings.py:103
+msgid "Norwegian Bokmal"
+msgstr "Norwegian Bokmal"
+
+#: conf/global_settings.py:104
+msgid "Nepali"
+msgstr "Nepali"
+
+#: conf/global_settings.py:105
+msgid "Dutch"
+msgstr "Dutch"
+
+#: conf/global_settings.py:106
+msgid "Norwegian Nynorsk"
+msgstr "Norwegian Nynorsk"
+
+#: conf/global_settings.py:107
+msgid "Ossetic"
+msgstr "Ossetic"
+
+#: conf/global_settings.py:108
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: conf/global_settings.py:109
+msgid "Polish"
+msgstr "Polish"
+
+#: conf/global_settings.py:110
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: conf/global_settings.py:111
+msgid "Brazilian Portuguese"
+msgstr "Brazilian Portuguese"
+
+#: conf/global_settings.py:112
+msgid "Romanian"
+msgstr "Romanian"
+
+#: conf/global_settings.py:113
+msgid "Russian"
+msgstr "Russian"
+
+#: conf/global_settings.py:114
+msgid "Slovak"
+msgstr "Slovak"
+
+#: conf/global_settings.py:115
+msgid "Slovenian"
+msgstr "Slovenian"
+
+#: conf/global_settings.py:116
+msgid "Albanian"
+msgstr "Albanian"
+
+#: conf/global_settings.py:117
+msgid "Serbian"
+msgstr "Serbian"
+
+#: conf/global_settings.py:118
+msgid "Serbian Latin"
+msgstr "Serbian Latin"
+
+#: conf/global_settings.py:119
+msgid "Swedish"
+msgstr "Swedish"
+
+#: conf/global_settings.py:120
+msgid "Swahili"
+msgstr "Swahili"
+
+#: conf/global_settings.py:121
+msgid "Tamil"
+msgstr "Tamil"
+
+#: conf/global_settings.py:122
+msgid "Telugu"
+msgstr "Telugu"
+
+#: conf/global_settings.py:123
+msgid "Thai"
+msgstr "Thai"
+
+#: conf/global_settings.py:124
+msgid "Turkish"
+msgstr "Turkish"
+
+#: conf/global_settings.py:125
+msgid "Tatar"
+msgstr "Tatar"
+
+#: conf/global_settings.py:126
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: conf/global_settings.py:127
+msgid "Ukrainian"
+msgstr "Ukrainian"
+
+#: conf/global_settings.py:128
+msgid "Urdu"
+msgstr "Urdu"
+
+#: conf/global_settings.py:129
+msgid "Vietnamese"
+msgstr "Vietnamese"
+
+#: conf/global_settings.py:130 conf/global_settings.py:131
+msgid "Simplified Chinese"
+msgstr "Simplified Chinese"
+
+#: conf/global_settings.py:132 conf/global_settings.py:133
+msgid "Traditional Chinese"
+msgstr "Traditional Chinese"
+
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
+#: core/validators.py:21
+msgid "Enter a valid value."
+msgstr "Enter a valid value."
+
+#: core/validators.py:77 forms/fields.py:675
+msgid "Enter a valid URL."
+msgstr "Enter a valid URL."
+
+#: core/validators.py:115
+msgid "Enter a valid integer."
+msgstr ""
+
+#: core/validators.py:120
+msgid "Enter a valid email address."
+msgstr "Enter a valid email address."
+
+#: core/validators.py:185
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+
+#: core/validators.py:188 core/validators.py:207
+msgid "Enter a valid IPv4 address."
+msgstr "Enter a valid IPv4 address."
+
+#: core/validators.py:193 core/validators.py:208
+msgid "Enter a valid IPv6 address."
+msgstr "Enter a valid IPv6 address."
+
+#: core/validators.py:203 core/validators.py:206
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Enter a valid IPv4 or IPv6 address."
+
+#: core/validators.py:229 db/models/fields/__init__.py:1070
+msgid "Enter only digits separated by commas."
+msgstr "Enter only digits separated by commas."
+
+#: core/validators.py:236
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+
+#: core/validators.py:255
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr "Ensure this value is less than or equal to %(limit_value)s."
+
+#: core/validators.py:262
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr "Ensure this value is greater than or equal to %(limit_value)s."
+
+#: core/validators.py:271
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgstr[1] ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+
+#: core/validators.py:282
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgstr[1] ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+
+#: db/models/base.py:975 forms/models.py:718
+msgid "and"
+msgstr "and"
+
+#: db/models/base.py:977
+#, python-format
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
+
+#: db/models/fields/__init__.py:104
+#, python-format
+msgid "Value %(value)r is not a valid choice."
+msgstr ""
+
+#: db/models/fields/__init__.py:105
+msgid "This field cannot be null."
+msgstr "This field cannot be null."
+
+#: db/models/fields/__init__.py:106
+msgid "This field cannot be blank."
+msgstr "This field cannot be blank."
+
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s with this %(field_label)s already exists."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Field of type: %(field_type)s"
+
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
+msgid "Integer"
+msgstr "Integer"
+
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: db/models/fields/__init__.py:926
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:928
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (Either True or False)"
+
+#: db/models/fields/__init__.py:1004
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "String (up to %(max_length)s)"
+
+#: db/models/fields/__init__.py:1065
+msgid "Comma-separated integers"
+msgstr "Comma-separated integers"
+
+#: db/models/fields/__init__.py:1080
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: db/models/fields/__init__.py:1085
+msgid "Date (without time)"
+msgstr "Date (without time)"
+
+#: db/models/fields/__init__.py:1187
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1191
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1195
+msgid "Date (with time)"
+msgstr "Date (with time)"
+
+#: db/models/fields/__init__.py:1297
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: db/models/fields/__init__.py:1299
+msgid "Decimal number"
+msgstr "Decimal number"
+
+#: db/models/fields/__init__.py:1444
+msgid "Email address"
+msgstr "Email address"
+
+#: db/models/fields/__init__.py:1470
+msgid "File path"
+msgstr "File path"
+
+#: db/models/fields/__init__.py:1537
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: db/models/fields/__init__.py:1539
+msgid "Floating point number"
+msgstr "Floating point number"
+
+#: db/models/fields/__init__.py:1623
+msgid "Big (8 byte) integer"
+msgstr "Big (8 byte) integer"
+
+#: db/models/fields/__init__.py:1638
+msgid "IPv4 address"
+msgstr "IPv4 address"
+
+#: db/models/fields/__init__.py:1668
+msgid "IP address"
+msgstr "IP address"
+
+#: db/models/fields/__init__.py:1747
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:1749
+msgid "Boolean (Either True, False or None)"
+msgstr "Boolean (Either True, False or None)"
+
+#: db/models/fields/__init__.py:1809
+msgid "Positive integer"
+msgstr "Positive integer"
+
+#: db/models/fields/__init__.py:1821
+msgid "Positive small integer"
+msgstr "Positive small integer"
+
+#: db/models/fields/__init__.py:1834
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (up to %(max_length)s)"
+
+#: db/models/fields/__init__.py:1863
+msgid "Small integer"
+msgstr "Small integer"
+
+#: db/models/fields/__init__.py:1870
+msgid "Text"
+msgstr "Text"
+
+#: db/models/fields/__init__.py:1893
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1895
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1898
+msgid "Time"
+msgstr "Time"
+
+#: db/models/fields/__init__.py:1977
+msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/__init__.py:2000
+msgid "Raw binary data"
+msgstr "Raw binary data"
+
+#: db/models/fields/files.py:225
+msgid "File"
+msgstr "File"
+
+#: db/models/fields/files.py:375
+msgid "Image"
+msgstr "Image"
+
+#: db/models/fields/related.py:1580
+#, python-format
+msgid "%(model)s instance with pk %(pk)r does not exist."
+msgstr ""
+
+#: db/models/fields/related.py:1582
+msgid "Foreign Key (type determined by related field)"
+msgstr "Foreign Key (type determined by related field)"
+
+#: db/models/fields/related.py:1773
+msgid "One-to-one relationship"
+msgstr "One-to-one relationship"
+
+#: db/models/fields/related.py:1843
+msgid "Many-to-many relationship"
+msgstr "Many-to-many relationship"
+
+#: forms/fields.py:55
+msgid "This field is required."
+msgstr "This field is required."
+
+#: forms/fields.py:236
+msgid "Enter a whole number."
+msgstr "Enter a whole number."
+
+#: forms/fields.py:279 forms/fields.py:316
+msgid "Enter a number."
+msgstr "Enter a number."
+
+#: forms/fields.py:318
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] "Ensure that there are no more than %(max)s digit in total."
+msgstr[1] "Ensure that there are no more than %(max)s digits in total."
+
+#: forms/fields.py:322
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] "Ensure that there are no more than %(max)s decimal place."
+msgstr[1] "Ensure that there are no more than %(max)s decimal places."
+
+#: forms/fields.py:326
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgstr[1] ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+
+#: forms/fields.py:437 forms/fields.py:1139
+msgid "Enter a valid date."
+msgstr "Enter a valid date."
+
+#: forms/fields.py:461 forms/fields.py:1140
+msgid "Enter a valid time."
+msgstr "Enter a valid time."
+
+#: forms/fields.py:483
+msgid "Enter a valid date/time."
+msgstr "Enter a valid date/time."
+
+#: forms/fields.py:564
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "No file was submitted. Check the encoding type on the form."
+
+#: forms/fields.py:565
+msgid "No file was submitted."
+msgstr "No file was submitted."
+
+#: forms/fields.py:566
+msgid "The submitted file is empty."
+msgstr "The submitted file is empty."
+
+#: forms/fields.py:568
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+"Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgstr[1] ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+
+#: forms/fields.py:571
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr "Please either submit a file or check the clear checkbox, not both."
+
+#: forms/fields.py:632
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr "Select a valid choice. %(value)s is not one of the available choices."
+
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
+msgid "Enter a list of values."
+msgstr "Enter a list of values."
+
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
+#. Translators: This is the default suffix added to form field labels
+#: forms/forms.py:122
+msgid ":"
+msgstr ":"
+
+#: forms/forms.py:192
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr "(Hidden field %(name)s) %(error)s"
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the
+#. label
+#: forms/forms.py:620
+msgid ":?.!"
+msgstr ":?.!"
+
+#: forms/formsets.py:95
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: forms/formsets.py:332
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] "Please submit %d or fewer forms."
+msgstr[1] "Please submit %d or fewer forms."
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
+msgid "Order"
+msgstr "Order"
+
+#: forms/formsets.py:371
+msgid "Delete"
+msgstr "Delete"
+
+#: forms/models.py:712
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Please correct the duplicate data for %(field)s."
+
+#: forms/models.py:716
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr "Please correct the duplicate data for %(field)s, which must be unique."
+
+#: forms/models.py:722
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+
+#: forms/models.py:730
+msgid "Please correct the duplicate values below."
+msgstr "Please correct the duplicate values below."
+
+#: forms/models.py:1028
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr "The inline foreign key did not match the parent instance primary key."
+
+#: forms/models.py:1094
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Select a valid choice. That choice is not one of the available choices."
+
+#: forms/models.py:1194
+#, python-format
+msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgstr "\"%(pk)s\" is not a valid value for a primary key."
+
+#: forms/models.py:1205
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+
+#: forms/utils.py:148
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+
+#: forms/widgets.py:350
+msgid "Currently"
+msgstr "Currently"
+
+#: forms/widgets.py:351
+msgid "Change"
+msgstr "Change"
+
+#: forms/widgets.py:352
+msgid "Clear"
+msgstr "Clear"
+
+#: forms/widgets.py:546
+msgid "Unknown"
+msgstr "Unknown"
+
+#: forms/widgets.py:547
+msgid "Yes"
+msgstr "Yes"
+
+#: forms/widgets.py:548
+msgid "No"
+msgstr "No"
+
+#: template/defaultfilters.py:855
+msgid "yes,no,maybe"
+msgstr "yes,no,maybe"
+
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
+
+#: template/defaultfilters.py:898
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: template/defaultfilters.py:900
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#: template/defaultfilters.py:902
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#: template/defaultfilters.py:904
+#, python-format
+msgid "%s TB"
+msgstr "%s TB"
+
+#: template/defaultfilters.py:906
+#, python-format
+msgid "%s PB"
+msgstr "%s PB"
+
+#: utils/dateformat.py:59
+msgid "p.m."
+msgstr "p.m."
+
+#: utils/dateformat.py:60
+msgid "a.m."
+msgstr "a.m."
+
+#: utils/dateformat.py:65
+msgid "PM"
+msgstr "PM"
+
+#: utils/dateformat.py:66
+msgid "AM"
+msgstr "AM"
+
+#: utils/dateformat.py:149
+msgid "midnight"
+msgstr "midnight"
+
+#: utils/dateformat.py:151
+msgid "noon"
+msgstr "noon"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Monday"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Tuesday"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Wednesday"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Thursday"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Friday"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Saturday"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Sunday"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "Mon"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "Tue"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "Wed"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "Thu"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "Fri"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "Sat"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "Sun"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "January"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "February"
+
+#: utils/dates.py:18
+msgid "March"
+msgstr "March"
+
+#: utils/dates.py:18
+msgid "April"
+msgstr "April"
+
+#: utils/dates.py:18
+msgid "May"
+msgstr "May"
+
+#: utils/dates.py:18
+msgid "June"
+msgstr "June"
+
+#: utils/dates.py:19
+msgid "July"
+msgstr "July"
+
+#: utils/dates.py:19
+msgid "August"
+msgstr "August"
+
+#: utils/dates.py:19
+msgid "September"
+msgstr "September"
+
+#: utils/dates.py:19
+msgid "October"
+msgstr "October"
+
+#: utils/dates.py:19
+msgid "November"
+msgstr "November"
+
+#: utils/dates.py:20
+msgid "December"
+msgstr "December"
+
+#: 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 "may"
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr "jun"
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr "jul"
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr "aug"
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr "sep"
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr "oct"
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr "nov"
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr "dec"
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr "Jan."
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr "Feb."
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "March"
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "April"
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "May"
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "June"
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "July"
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr "Aug."
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr "Sept."
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr "Oct."
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "Nov."
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "Dec."
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr "January"
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr "February"
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr "March"
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr "April"
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr "May"
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr "June"
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr "July"
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr "August"
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr "September"
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr "October"
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr "November"
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr "December"
+
+#: utils/ipv6.py:10
+msgid "This is not a valid IPv6 address."
+msgstr ""
+
+#: utils/text.py:76
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:245
+msgid "or"
+msgstr "or"
+
+#. Translators: This string is used as a separator between list elements
+#: utils/text.py:264 utils/timesince.py:57
+msgid ", "
+msgstr ", "
+
+#: utils/timesince.py:25
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d year"
+msgstr[1] "%d years"
+
+#: utils/timesince.py:26
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d month"
+msgstr[1] "%d months"
+
+#: utils/timesince.py:27
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d week"
+msgstr[1] "%d weeks"
+
+#: utils/timesince.py:28
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d day"
+msgstr[1] "%d days"
+
+#: utils/timesince.py:29
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
+
+#: utils/timesince.py:30
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#: utils/timesince.py:46
+msgid "0 minutes"
+msgstr "0 minutes"
+
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
+
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
+msgid "No year specified"
+msgstr "No year specified"
+
+#: views/generic/dates.py:99
+msgid "No month specified"
+msgstr "No month specified"
+
+#: views/generic/dates.py:158
+msgid "No day specified"
+msgstr "No day specified"
+
+#: views/generic/dates.py:214
+msgid "No week specified"
+msgstr "No week specified"
+
+#: views/generic/dates.py:369 views/generic/dates.py:397
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "No %(verbose_name_plural)s available"
+
+#: views/generic/dates.py:650
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+
+#: views/generic/dates.py:682
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr "Invalid date string '%(datestr)s' given format '%(format)s'"
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "No %(verbose_name)s found matching the query"
+
+#: views/generic/list.py:62
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr "Page is not 'last', nor can it be converted to an int."
+
+#: views/generic/list.py:67
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Invalid page (%(page_number)s): %(message)s"
+
+#: views/generic/list.py:158
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr "Empty list and '%(class_name)s.allow_empty' is False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Directory indexes are not allowed here."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" does not exist"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Index of %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/en_GB/formats.py python-django-1.7.4/django/conf/locale/en_GB/formats.py
--- python-django-1.6.6/django/conf/locale/en_GB/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/en_GB/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -40,4 +40,3 @@
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
NUMBER_GROUPING = 3
-
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/en_GB/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/en_GB/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/en_GB/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/en_GB/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/en_GB/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/en_GB/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -6,10 +6,10 @@
# Ross Poulton , 2011-2012
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
"django/language/en_GB/)\n"
@@ -28,6 +28,10 @@
msgstr "Arabic"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azerbaijani"
@@ -80,319 +84,347 @@
msgstr "English"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "British English"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Spanish"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Argentinian Spanish"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Mexican Spanish"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Nicaraguan Spanish"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estonian"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Basque"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persian"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finnish"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "French"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frisian"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Irish"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galician"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebrew"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Croatian"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Hungarian"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonesian"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Icelandic"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Italian"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japanese"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Georgian"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazakh"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Korean"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Lithuanian"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Latvian"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Macedonian"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongolian"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Norwegian Bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepali"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Dutch"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Norwegian Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Polish"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portuguese"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Brazilian Portuguese"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Romanian"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Russian"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slovak"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Slovenian"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albanian"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbian"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serbian Latin"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Swedish"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turkish"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatar"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ukrainian"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vietnamese"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Simplified Chinese"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Traditional Chinese"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Enter a valid value."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Enter a valid URL."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Enter a valid IPv4 address."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Enter a valid IPv6 address."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Enter a valid IPv4 or IPv6 address."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Enter only digits separated by commas."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Ensure this value is less than or equal to %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Ensure this value is greater than or equal to %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -403,7 +435,7 @@
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -414,247 +446,255 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "and"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s with this %(field_label)s already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "This field cannot be null."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "This field cannot be blank."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s with this %(field_label)s already exists."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Field of type: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Integer"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boolean (Either True or False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (up to %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Comma-separated integers"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Date (without time)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Date (with time)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Decimal number"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Email address"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "File path"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Floating point number"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Big (8 byte) integer"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 address"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP address"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (Either True, False or None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Positive integer"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Positive small integer"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (up to %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Small integer"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Time"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "File"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Image"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (type determined by related field)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "One-to-one relationship"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Many-to-many relationship"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "This field is required."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Enter a whole number."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Enter a number."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -663,31 +703,31 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Enter a valid date."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Enter a valid time."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Enter a valid date/time."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "No file was submitted. Check the encoding type on the form."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "No file was submitted."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "The submitted file is empty."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -695,11 +735,11 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Please either submit a file or check the clear checkbox, not both."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -707,21 +747,25 @@
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Select a valid choice. %(value)s is not one of the available choices."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Enter a list of values."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -729,40 +773,47 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Order"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Delete"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Please correct the duplicate data for %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Please correct the duplicate data for %(field)s, which must be unique."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -771,31 +822,31 @@
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Please correct the duplicate values below."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "The inline foreign key did not match the parent instance primary key."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Select a valid choice. That choice is not one of the available choices."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -804,15 +855,15 @@
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Currently"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Change"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Clear"
@@ -828,63 +879,63 @@
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "yes,no,maybe"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "midnight"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "noon"
@@ -1160,117 +1211,133 @@
msgid "December"
msgstr "December"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "or"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Directory indexes are not allowed here."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" does not exist"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "No year specified"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "No month specified"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "No day specified"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "No week specified"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "No %(verbose_name_plural)s available"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1279,7 +1346,7 @@
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Invalid date string '%(datestr)s' given format '%(format)s'"
@@ -1289,16 +1356,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "No %(verbose_name)s found matching the query"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Page is not 'last', nor can it be converted to an int."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Empty list and '%(class_name)s.allow_empty' is False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Directory indexes are not allowed here."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" does not exist"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Index of %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/eo/formats.py python-django-1.7.4/django/conf/locale/eo/formats.py
--- python-django-1.6.6/django/conf/locale/eo/formats.py 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/eo/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+from __future__ import unicode_literals
+
+# The *_FORMAT strings use the Django date format syntax,
+# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+DATE_FORMAT = r'j\-\a \d\e F Y' # '26-a de julio 1887'
+TIME_FORMAT = 'H:i:s' # '18:59:00'
+DATETIME_FORMAT = r'j\-\a \d\e F Y\, \j\e H:i:s' # '26-a de julio 1887, je 18:59:00'
+YEAR_MONTH_FORMAT = r'F \d\e Y' # 'julio de 1887'
+MONTH_DAY_FORMAT = r'j\-\a \d\e F' # '26-a de julio'
+SHORT_DATE_FORMAT = 'Y-m-d' # '1887-07-26'
+SHORT_DATETIME_FORMAT = 'Y-m-d H:i:s' # '1887-07-26 18:59:00'
+FIRST_DAY_OF_WEEK = 1 # Monday (lundo)
+
+# The *_INPUT_FORMATS strings use the Python strftime format syntax,
+# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+DATE_INPUT_FORMATS = (
+ '%Y-%m-%d', # '1887-07-26'
+ '%y-%m-%d', # '87-07-26'
+ '%Y %m %d', # '1887 07 26'
+ '%d-a de %b %Y', # '26-a de jul 1887'
+ '%d %b %Y', # '26 jul 1887'
+ '%d-a de %B %Y', # '26-a de julio 1887'
+ '%d %B %Y', # '26 julio 1887'
+ '%d %m %Y', # '26 07 1887'
+)
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '18:59:00'
+ '%H:%M', # '18:59'
+)
+DATETIME_INPUT_FORMATS = (
+ '%Y-%m-%d %H:%M:%S', # '1887-07-26 18:59:00'
+ '%Y-%m-%d %H:%M', # '1887-07-26 18:59'
+ '%Y-%m-%d', # '1887-07-26'
+
+ '%Y.%m.%d %H:%M:%S', # '1887.07.26 18:59:00'
+ '%Y.%m.%d %H:%M', # '1887.07.26 18:59'
+ '%Y.%m.%d', # '1887.07.26'
+
+ '%d/%m/%Y %H:%M:%S', # '26/07/1887 18:59:00'
+ '%d/%m/%Y %H:%M', # '26/07/1887 18:59'
+ '%d/%m/%Y', # '26/07/1887'
+
+ '%y-%m-%d %H:%M:%S', # '87-07-26 18:59:00'
+ '%y-%m-%d %H:%M', # '87-07-26 18:59'
+ '%y-%m-%d', # '87-07-26'
+)
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
+NUMBER_GROUPING = 3
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/eo/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/eo/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/eo/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/eo/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/eo/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/eo/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -1,19 +1,19 @@
# This file is distributed under the same license as the Django package.
#
# Translators:
-# Baptiste , 2012-2013
-# Baptiste , 2013
+# Baptiste Darthenay , 2012-2013
+# Baptiste Darthenay , 2013-2014
# batisteo , 2011
# Dinu Gherman , 2011
# kristjan , 2011
-# sagittarian , 2012
+# Adamo Mesha , 2012
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-10-23 14:39+0000\n"
-"Last-Translator: Baptiste \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-27 10:23+0000\n"
+"Last-Translator: Baptiste Darthenay \n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
"language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,10 @@
msgstr "Araba"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "Asturia"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azerbajĝana"
@@ -83,320 +87,348 @@
msgstr "Angla"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "Angla (Aŭstralia)"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Angla (Brita)"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Hispana"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Hispana (Argentinio)"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Hispana (Meksiko)"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Hispana (Nikaragvo)"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Hispana (Venezuelo)"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estona"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Eŭska"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finna"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Franca"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frisa"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Irlanda"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galega"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebrea"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hinda"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Kroata"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Hungara"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingvaa"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indoneza"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr "Ido"
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Islanda"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Itala"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japana"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Kartvela"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazaĥa"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Kmera"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kanara"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Korea"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Lukszemburga"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Litova"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Latva"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Makedona"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malajala"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongola"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr "Marata"
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "Birma"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Norvega (bokmål)"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepala"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Nederlanda"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Norvega (nynorsk)"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "Oseta"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Panĝaba"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Pola"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugala"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Portugala (Brazilo)"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Rumana"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Rusa"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slovaka"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Slovena"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albana"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serba"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serba (latina)"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Sveda"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Svahila"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamila"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telugua"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Taja"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turka"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatara"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Udmurta"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ukraina"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdua"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vjetnama"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Ĉina (simpligite)"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Ĉina (tradicie)"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Retejaj mapoj"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Statikaj dosieroj"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Abonrilato"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Reteja dezajno"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Enigu validan valoron."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Enigu validan adreson."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr "Enigu validan entjero."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Enigu validan retpoŝtan adreson."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Tiu kampo nur devas havi literojn, nombrojn, substrekojn aŭ streketojn."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Enigu validan IPv4-adreson."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Enigu validan IPv6-adreson."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Enigu validan IPv4 aŭ IPv6-adreson."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Enigu nur ciferojn apartigitajn per komoj."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Certigu ke ĉi tiu valoro estas %(limit_value)s (ĝi estas %(show_value)s). "
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Certigu ke ĉi tiu valoro estas malpli ol aŭ egala al %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Certigu ke ĉi tiu valoro estas pli ol aŭ egala al %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -411,7 +443,7 @@
"Certigu, ke tiu valuto havas %(limit_value)d karakteroj (ĝi havas "
"%(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -426,66 +458,75 @@
"Certigu, ke tio valuto maksimume havas %(limit_value)d karakterojn (ĝi havas "
"%(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s devas esti unika por %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "kaj"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s kun tiu %(field_label)s jam ekzistas."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s kun tiuj %(field_labels)s jam ekzistas."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr "Valoro %(value)r ne estas valida elekto."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Tiu ĉi kampo ne povas esti senvalora (null)."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Tiu ĉi kampo ne povas esti malplena."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s kun tiu %(field_label)s jam ekzistas."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s devas esti unika por %(date_field_label)s %(lookup_type)s."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Kampo de tipo: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Entjero"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr "'%(value)s' valoro devas esti entjero."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr "'%(value)s' valoro devas esti Vera aŭ Malvera"
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Bulea (Vera aŭ Malvera)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Ĉeno (ĝis %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Kom-apartigitaj entjeroj"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
@@ -494,7 +535,7 @@
"'%(value)s' valoro ne havas validan datformaton. Ĝi devas esti kiel formato "
"JJJJ-MM-TT."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
@@ -503,11 +544,11 @@
"'%(value)s' valoro havas la ĝustan formaton (JJJJ-MM-TT), sed ne estas "
"valida dato."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Dato (sen horo)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
@@ -516,7 +557,7 @@
"'%(value)s' valoro ne havas validan formaton. Ĝi devas esti kiel formato "
"JJJJ-MM-TT HH:MM[:ss[.uuuuuu]][HZ]."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
@@ -525,79 +566,79 @@
"'%(value)s' valoro havas la ĝustan formaton (JJJJ-MM-TT HH:MM[:ss[.uuuuuu]]"
"[HZ]), sed ne estas valida dato kaj horo."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Dato (kun horo)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr "'%(value)s' valoro devas esti dekuma nombro."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Dekuma nombro"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Retpoŝtadreso"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Dosiervojo"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr "'%(value)s' valoro devas esti glitkoma nombro."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Glitkoma nombro"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Granda (8 bitoka) entjero"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4-adreso"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP-adreso"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr "'%(value)s' valoro devas esti Neniu, Vera aŭ Malvera."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Buleo (Vera, Malvera aŭ Neniu)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Pozitiva entjero"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Pozitiva malgranda entjero"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Ĵetonvorto (ĝis %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Malgranda entjero"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Teksto"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
@@ -606,7 +647,7 @@
"'%(value)s' valoro ne havas validan formaton. Ĝi devas esti laŭ la formato "
"HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
@@ -615,70 +656,70 @@
"'%(value)s' valoro havas ĝustan formaton (HH:MM[:ss[.uuuuuu]]), sed ne estas "
"valida horo."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Horo"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Kruda binara datumo"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Dosiero"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Bildo"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr "%(model)s apero kun ĉefŝlosilo %(pk)r ne ekzistas."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Fremda ŝlosilo (tipo determinita per rilata kampo)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Unu-al-unu rilato"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Mult-al-multa rilato"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Ĉi tiu kampo estas deviga."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Enigu plenan nombron."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Enigu nombron."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "Certigu ke ne estas pli ol %(max)s cifero entute."
msgstr[1] "Certigu ke ne estas pli ol %(max)s ciferoj entute."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] "Certigu, ke ne estas pli ol %(max)s dekumaj lokoj."
msgstr[1] "Certigu, ke ne estas pli ol %(max)s dekumaj lokoj."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -687,33 +728,33 @@
msgstr[0] "Certigu ke ne estas pli ol %(max)s ciferoj antaŭ la dekuma punkto."
msgstr[1] "Certigu ke ne estas pli ol %(max)s ciferoj antaŭ la dekuma punkto."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Enigu validan daton."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Enigu validan horon."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Enigu validan daton/tempon."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Neniu dosiero estis alŝutita. Kontrolu la kodoprezentan tipon en la "
"formularo."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Neniu dosiero estis alŝutita."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "La alŝutita dosiero estas malplena."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -725,12 +766,12 @@
"Certigu, ke tio dosiernomo maksimume havas %(max)d karakterojn (ĝi havas "
"%(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Bonvolu aŭ alŝuti dosieron, aŭ elekti la malplenan markobutonon, ne ambaŭ."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -738,21 +779,25 @@
"Alŝutu validan bildon. La alŝutita dosiero ne estas bildo, aŭ estas "
"difektita bildo."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Elektu validan elekton. %(value)s ne estas el la eblaj elektoj."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Enigu liston de valoroj."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Enigu kompletan valoron."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(Kaŝita kampo %(name)s) %(error)s"
@@ -760,41 +805,48 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr "ManagementForm datumoj mankas, aŭ estas tuŝaĉitaj kun"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "Bonvolu sendi %d aŭ malpli formularojn."
msgstr[1] "Bonvolu sendi %d aŭ malpli formularojn."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Bonvolu sendi %d aŭ pli formularojn."
+msgstr[1] "Bonvolu sendi %d aŭ pli formularojn."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ordo"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Forigi"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Bonvolu ĝustigi la duoblan datumon por %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Bonvolu ĝustigi la duoblan datumon por %(field)s, kiu devas esti unika."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -803,30 +855,30 @@
"Bonvolu ĝustigi la duoblan datumon por %(field_name)s, kiu devas esti unika "
"por la %(lookup)s en %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Bonvolu ĝustigi la duoblan valoron sube."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "La enteksta fremda ŝlosilo ne egalis la ĉefŝlosilon de patra apero."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Elektu validan elekton. Ĉi tiu elekto ne estas el la eblaj elektoj."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" ne estas valida valuto por la ĉefa ŝlosilo."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Premadu la stirklavon, aŭ Komando-klavon ĉe Mac, por elekti pli ol unu."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -835,15 +887,15 @@
"%(datetime)s ne povus esti interpretita en horzono %(current_timezone)s; ĝi "
"povas esti plursenca aŭ ne ekzistas."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Nuntempe"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Ŝanĝi"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Vakigi"
@@ -859,63 +911,63 @@
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "jes,ne,eble"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bitoko"
msgstr[1] "%(size)d bitokoj"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "ptm"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "atm"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PTM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "ATM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "noktomezo"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "tagmezo"
@@ -977,51 +1029,51 @@
#: utils/dates.py:18
msgid "January"
-msgstr "Januaro"
+msgstr "januaro"
#: utils/dates.py:18
msgid "February"
-msgstr "Februaro"
+msgstr "februaro"
#: utils/dates.py:18
msgid "March"
-msgstr "Marto"
+msgstr "marto"
#: utils/dates.py:18
msgid "April"
-msgstr "Aprilo"
+msgstr "aprilo"
#: utils/dates.py:18
msgid "May"
-msgstr "Majo"
+msgstr "majo"
#: utils/dates.py:18
msgid "June"
-msgstr "Junio"
+msgstr "junio"
#: utils/dates.py:19
msgid "July"
-msgstr "Julio"
+msgstr "julio"
#: utils/dates.py:19
msgid "August"
-msgstr "Aŭgusto"
+msgstr "aŭgusto"
#: utils/dates.py:19
msgid "September"
-msgstr "Septembro"
+msgstr "septembro"
#: utils/dates.py:19
msgid "October"
-msgstr "Oktobro"
+msgstr "oktobro"
#: utils/dates.py:19
msgid "November"
-msgstr "Novembro"
+msgstr "novembro"
#: utils/dates.py:20
msgid "December"
-msgstr "Decembro"
+msgstr "decembro"
#: utils/dates.py:23
msgid "jan"
@@ -1074,62 +1126,62 @@
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Jan."
+msgstr "jan."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Feb."
+msgstr "feb."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Marto"
+msgstr "marto"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Aprilo"
+msgstr "apr."
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Majo"
+msgstr "majo"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Junio"
+msgstr "jun."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Julio"
+msgstr "jul."
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Aŭg."
+msgstr "aŭg."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Sept."
+msgstr "sept."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Okt."
+msgstr "okt."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Nov."
+msgstr "nov."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Dec."
+msgstr "dec."
#: utils/dates.py:45
msgctxt "alt. month"
@@ -1191,117 +1243,145 @@
msgid "December"
msgstr "Decembro"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "Nek Pillow nek PIL povus esti importita: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "La '_figurada' modulo por la PIL ne povus esti importita: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "Tiu ne estas valida IPv6-adreso."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "aŭ"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d jaro"
msgstr[1] "%d jaroj"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d monato"
msgstr[1] "%d monatoj"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semajno"
msgstr[1] "%d semajnoj"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d tago"
msgstr[1] "%d tagoj"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d horo"
msgstr[1] "%d horoj"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutoj"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minutoj"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Dosierujaj indeksoj ne estas permesitaj tie."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Malpermesa"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "CSRF konfirmo malsukcesis. Peto ĉesigita."
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" ne ekzistas"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Vi vidas tiun mesaĝon ĉar ĉi HTTPS retejo postulas “Referer header” esti "
+"sendita per via foliumilo, sed neniu estis sendita. Ĉi kaplinio estas "
+"bezonata pro motivoj de sekureco, por certigi ke via retumilo ne estu "
+"forrabita de triaj partioj."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Indekso de %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Se vi agordis vian foliumilon por malebligi “Referer” kaplinioj, bonvolu "
+"reaktivigi ilin, almenaŭ por tiu ĉi retejo, aŭ por HTTPS rilatoj, aŭ por "
+"“samoriginaj” petoj."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Vi vidas tiun mesaĝon ĉar tiu-ĉi retejo postulas CSRF kuketon sendante "
+"formojn. Tiu-ĉi kuketo estas bezonata pro motivoj de sekureco, por certigi "
+"ke via retumilo ne esti forrabita de triaj partioj."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Se vi agordis vian foliumilon por malŝalti kuketojn, bonvole reaktivigi "
+"ilin, almenaŭ por tiu ĉi retejo, aŭ por “samoriginaj” petoj."
-#: views/generic/dates.py:42
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Pliaj informoj estas videblaj kun DEBUG=True."
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Neniu jaro specifita"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Neniu monato specifita"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Neniu tago specifita"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Neniu semajno specifita"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Neniu %(verbose_name_plural)s disponeblaj"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1310,7 +1390,7 @@
"Estonta %(verbose_name_plural)s ne disponeblas ĉar %(class_name)s."
"allow_future estas Malvera."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1322,16 +1402,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Neniu %(verbose_name)s trovita kongruas kun la informpeto"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Paĝo ne estas 'last', kaj ne povus esti transformita al entjero."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Nevalida paĝo (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Malplena listo kaj '%(class_name)s.allow_empty' estas Malvera."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Dosierujaj indeksoj ne estas permesitaj tie."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ne ekzistas"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indekso de %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/es/formats.py python-django-1.7.4/django/conf/locale/es/formats.py
--- python-django-1.6.6/django/conf/locale/es/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/es/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,7 +12,7 @@
MONTH_DAY_FORMAT = r'j \d\e F'
SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
-FIRST_DAY_OF_WEEK = 1 # Monday
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
@@ -31,4 +31,3 @@
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
NUMBER_GROUPING = 3
-
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/es/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/es/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/es/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/es/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/es/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/es/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,11 +2,14 @@
#
# Translators:
# Abraham Estrada , 2013
-# Antoni Aloy , 2011-2013
+# albertoalcolea , 2014
+# Antoni Aloy , 2011-2014
# Diego Andres Sanabria Martin , 2012
# Diego Schulz , 2012
+# Ernesto Avilés Vzqz , 2014
# franchukelly , 2011
# Jannis Leidel , 2011
+# Josue Naaman Nistal Guerra , 2014
# Leonardo J. Caballero G. , 2011,2013
# Marc Garcia , 2011
# monobotsoft , 2012
@@ -15,11 +18,11 @@
# Sebastián Ramírez Magrí , 2013
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-11-05 07:56+0000\n"
-"Last-Translator: Antoni Aloy \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-09-02 11:36+0000\n"
+"Last-Translator: albertoalcolea \n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
"es/)\n"
"MIME-Version: 1.0\n"
@@ -37,6 +40,10 @@
msgstr "Árabe"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "Asturiano"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azerbaiyán"
@@ -89,322 +96,350 @@
msgstr "Inglés"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "Inglés australiano"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Inglés británico"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Español"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Español de Argentina"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Español de México"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Español de Nicaragua"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Español venezolano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estonio"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Vasco"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finés"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Francés"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frisón"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Irlandés"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Gallego"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebreo"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Croata"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Húngaro"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonesio"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr "Ido"
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Islandés"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japonés"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Georgiano"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazajo"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Koreano"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Luxenburgués"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Lituano"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Letón"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Macedonio"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongol"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr "Maratí"
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "Birmano"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Nokmål"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepalí"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Holandés"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "Osetio"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Panyabí"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Polaco"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugués"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Portugués de Brasil"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Rumano"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Ruso"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Eslovaco"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Esloveno"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albanés"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbio"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serbio latino"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Sueco"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Suajili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Tailandés"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turco"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tártaro"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Udmurt"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ucraniano"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vietnamita"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Cino simplificado"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Chino tradicional"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Mapas del sitio"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Archivos estáticos"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Sindicación"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Diseño Web"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Introduzca un valor correcto."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr "Introduzca un entero válido."
+msgstr "Introduzca un número entero válido."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Introduzca una dirección de correo electrónico válida."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Introduzca un 'slug' válido, consistente en letras, números, guiones bajos o "
"medios."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Introduzca una dirección IPv6 válida."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Introduzca una dirección IPv4 o IPv6 válida."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Introduzca sólo dígitos separados por comas."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Asegúrese de que este valor es %(limit_value)s (actualmente es "
"%(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor es menor o igual a %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor es mayor o igual a %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -419,7 +454,7 @@
"Asegúrese de que este valor tenga al menos %(limit_value)d caracteres (tiene "
"%(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -434,259 +469,268 @@
"Asegúrese de que este valor tenga menos de %(limit_value)d caracteres (tiene "
"%(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "El campo %(field_name)s debe ser único para %(lookup)s %(date_field)s"
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "y"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Ya existe %(model_name)s con este %(field_label)s."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s con este %(field_labels)s ya existe."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
-msgstr "El valor %(value)r no es una opción válida."
+msgstr "Valor %(value)r no es una opción válida."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Este campo no puede ser nulo."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Este campo no puede estar vacío."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Ya existe %(model_name)s con este %(field_label)s."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s debe ser unico para %(date_field_label)s %(lookup_type)s."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo de tipo: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Entero"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr "El valor '%(value)s' debe ser un entero."
+msgstr "'%(value)s' valor debe ser un entero."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr "El valor '%(value)s' debe ser Verdadero o Falso."
+msgstr "Valor '%(value)s' debe ser verdadero o falso."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadero o Falso)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-"El valor '%(value)s' tiene un formato de fecha incorrecto. Debe ser del tipo "
-"YYYY-MM-DD."
+"'%(value)s' valor tiene un formato de fecha no válida. Debe estar en formato "
+"AAAA-MM-DD."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-"El valor '%(value)s' tiene el formato correcto (YYYY-MM-DD) pero no es una "
-"fecha válida."
+"'%(value)s' valor tiene el formato correcto (AAAA-MM-DD), pero es una fecha "
+"no válida."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-"El valor '%(value)s' tiene un formato inválido. Debe ser de la forma YYYY-MM-"
-"DD HH:MM[:ss[.uuuuuu]][TZ] ."
+"'%(value)s' valor tiene un formato válido. Debe estar en formato AAAA-MM-DD "
+"HH: [TZ]: MM [ss [uuuuuu].]."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-"El valor '%(value)s' tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[."
-"uuuuuu]][TZ]) pero no representa una fecha/hora válida."
+"'%(value)s' valor tiene el formato correcto (AAAA-MM-DD HH: MM [:. Ss "
+"[uuuuuu]] [TZ]), pero es una fecha no válida / hora."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Fecha (con hora)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
-msgstr "El valor '%(value)s' debe ser un número decimal."
+msgstr "'%(value)s' valor debe ser un número decimal."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "dirección de correo electrónico"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Ruta de fichero"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
-msgstr "El valor '%(value)s' debe ser un número real."
+msgstr "Valor '%(value)s' debe ser un float."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Número en coma flotante"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Entero grande (8 bytes)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Dirección IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Dirección IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr "El valor '%(value)s' debe ser None, Verdaro o False."
+msgstr "Valor '%(value)s' debe ser Ninguno, Verdadero o Falso."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Entero positivo"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Entero positivo corto"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (hasta %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Entero corto"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-"El valor '%(value)s' tiene un formato inválido. Debe ser de la forma HH:MM[:"
-"ss[.uuuuuu]]."
+"'%(value)s' valor tiene un formato inválido. Debe estar en formato HH: MM "
+"[: SS [uuuuuu].] ."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-"El valor '%(value)s' tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero "
-"no representa una hora válida."
+"'%(value)s' valor tiene el formato correcto (HH: MM [:. Ss [uuuuuu]]), pero "
+"es un tiempo no válido."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Data de binarios brutos"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Archivo"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Imagen"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
-msgstr "La instancia de %(model)s con pk %(pk)r no existe."
+msgstr "No existe %(model)s instancia con pk %(pk)r."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Llave foránea (tipo determinado por el campo relacionado)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Relación uno-a-uno"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Relación muchos-a-muchos"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Este campo es obligatorio."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Introduzca un número."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "Asegúrese de que no hay más de %(max)s dígito en total."
msgstr[1] "Asegúrese de que no hay más de %(max)s dígitos en total."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] "Asegúrese de que no haya más de %(max)s dígito decimal."
msgstr[1] "Asegúrese de que no haya más de %(max)s dígitos decimales."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -697,33 +741,33 @@
msgstr[1] ""
"Asegúrese de que no haya más de %(max)s dígitos antes del punto decimal."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Introduzca una hora válida."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Introduzca una fecha/hora válida."
-#: forms/fields.py:539
+#: forms/fields.py:564
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."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "No se ha enviado ningún fichero"
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "El fichero enviado está vacío."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -735,12 +779,12 @@
"Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracteres "
"(tiene %(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Por favor envíe un fichero o marque la casilla de limpiar, pero no ambos."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -748,22 +792,26 @@
"Envíe una imagen válida. El fichero que ha enviado no era una imagen o se "
"trataba de una imagen corrupta."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, 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."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Introduzca un valor completo."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(Compo oculto %(name)s) *%(error)s"
@@ -771,41 +819,48 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
-msgstr "Los datos de ManagementForm no están o han sido manipulados con"
+msgstr "Datos ManagementForm falta o ha sido manipulado"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "Por favor, envíe %d o menos formas."
msgstr[1] "Por favor, envíe %d o menos formas."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Por favor, envíe %d o más formas."
+msgstr[1] "Por favor, envíe %d o más formas."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Orden"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor, corrija el dato duplicado para %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Por favor corriga el dato duplicado para %(field)s, el cual debe ser único."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -814,33 +869,33 @@
"Por favor corriga los datos duplicados para %(field_name)s el cual debe ser "
"único para %(lookup)s en %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija los valores duplicados abajo."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clave foránea en linea no coincide con la clave primaria de la instancia "
"padre."
-#: forms/models.py:1050
+#: forms/models.py:1094
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:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" no es un valor válido para una llave primaria."
-#: forms/models.py:1158
+#: forms/models.py:1205
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."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -849,15 +904,15 @@
"%(datetime)s no puede interpretarse en la zona temporal "
"%(current_timezone)s; puede ser ambiguo o puede no existir."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Actualmente"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Limpiar"
@@ -873,63 +928,63 @@
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "sí, no, quizás"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "media noche"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "medio día"
@@ -1205,117 +1260,145 @@
msgid "December"
msgstr "Diciembre"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "No se pudo importar Pillow o PIL: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "El módulo '_imaging' para PIL no pudo ser importado: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr "No es una dirección IPV6 válida."
+msgstr "Esto no es una dirección IPv6 válida."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d año"
msgstr[1] "%d años"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d mes"
msgstr[1] "%d meses"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d día"
msgstr[1] "%d días"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minutos"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Los índices de directorio no están permitidos."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Prohibido"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "CSRF verificacion fallida. Solicitud abortada"
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" no existe"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Estás viendo este mensaje porque este sitio web es HTTPS y requiere que tu "
+"navegador envíe la cabecera Referer y no se envió ninguna. Esta cabecera se "
+"necesita por razones de seguridad, para asegurarse de que tu navegador no ha "
+"sido comprometido por terceras partes."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Índice de %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Si has configurado tu navegador para desactivar las cabeceras 'Referer', por "
+"favor vuélvelas a activar, al menos para esta web, o para conexiones HTTPS, "
+"o para peticiones 'mismo-origen'."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Estás viendo este mensaje porqué esta web requiere una cookie CSRF cuando se "
+"envían formularios. Esta cookie se necesita por razones de seguridad, para "
+"asegurar que tu navegador no ha sido comprometido por terceras partes."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Si has inhabilitado las cookies en tu navegador, por favor habilítalas "
+"nuevamente al menos para este sitio, o para solicitudes del mismo origen."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Se puede ver más información si se establece DEBUG=True."
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "No se ha indicado el año"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "No se ha indicado el mes"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "No se ha indicado el día"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "No se ha indicado la semana"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "No %(verbose_name_plural)s disponibles"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1324,7 +1407,7 @@
"Los futuros %(verbose_name_plural)s no están disponibles porque "
"%(class_name)s.allow_future es Falso."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Fecha '%(datestr)s' no válida, el formato válido es '%(format)s'"
@@ -1334,16 +1417,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "No se encontró ningún %(verbose_name)s coincidente con la consulta"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "La página no es la \"ultima\", ni puede ser convertida a un entero."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Página inválida (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Lista vacía y '%(class_name)s.allow_empty' es Falso."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Los índices de directorio no están permitidos."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" no existe"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Índice de %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/es_AR/formats.py python-django-1.7.4/django/conf/locale/es_AR/formats.py
--- python-django-1.6.6/django/conf/locale/es_AR/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/es_AR/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,13 +12,13 @@
MONTH_DAY_FORMAT = r'j \d\e F'
SHORT_DATE_FORMAT = r'd/m/Y'
SHORT_DATETIME_FORMAT = r'd/m/Y H:i'
-FIRST_DAY_OF_WEEK = 0 # 0: Sunday, 1: Monday
+FIRST_DAY_OF_WEEK = 0 # 0: Sunday, 1: Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
DATE_INPUT_FORMATS = (
- '%d/%m/%Y', # '31/12/2009'
- '%d/%m/%y', # '31/12/09'
+ '%d/%m/%Y', # '31/12/2009'
+ '%d/%m/%y', # '31/12/09'
)
DATETIME_INPUT_FORMATS = (
'%d/%m/%Y %H:%M:%S',
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/es_AR/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/es_AR/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/es_AR/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/es_AR/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/es_AR/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/es_AR/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,13 +2,15 @@
#
# Translators:
# Jannis Leidel , 2011
-# Ramiro Morales , 2013
+# lardissone , 2014
+# poli , 2014
+# Ramiro Morales , 2013-2014
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-11-05 02:08+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-25 14:03+0000\n"
"Last-Translator: Ramiro Morales \n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
"django/language/es_AR/)\n"
@@ -27,6 +29,10 @@
msgstr "árabe"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "asturiano"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azerbaiyán"
@@ -79,320 +85,348 @@
msgstr "inglés"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "inglés australiano"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "inglés británico"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "español"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "español de Argentina"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Español de México"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Español (Nicaragua)"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "español de Venezuela"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "estonio"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "vasco"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "persa"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "finlandés"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "francés"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "frisón"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "irlandés"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "gallego"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "hebreo"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "croata"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "húngaro"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "indonesio"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr "ido"
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "islandés"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "japonés"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "georgiano"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "kazajo"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "jémer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "canarés"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "coreano"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "luxemburgués"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "lituano"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "letón"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "macedonio"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "mongol"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr "maratí"
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "burmés"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "bokmål"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "nepalés"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "holandés"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "osetio"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Panyabí"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "polaco"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "portugués"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "portugués de Brasil"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "rumano"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "ruso"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "eslovaco"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "esloveno"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "albanés"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "serbio"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Latín de Serbia"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "sueco"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "suajili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "tailandés"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "tártaro"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "udmurto"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ucraniano"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "chino simplificado"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "chino tradicional"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Mapas de sitio"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Archivos estáticos"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Sindicación"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Diseño Web"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Introduzca un valor válido."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr "Introduzca un valor numérico entero válido."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Introduzca una dirección de email válida."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "Introduzca un 'slug' válido consistente de letras, números o guiones."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida"
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Introduzca una dirección IPv6 válida."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Introduzca una dirección IPv4 o IPv6 válida."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Introduzca sólo dígitos separados por comas."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Asegúrese de que este valor sea %(limit_value)s (actualmente es "
"%(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor sea menor o igual a %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor sea mayor o igual a %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -407,7 +441,7 @@
"Asegúrese de que este valor tenga como mínimo %(limit_value)d caracteres "
"(tiene %(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -422,68 +456,76 @@
"Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres "
"(tiene %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"%(field_name)s debe ser único/a para un %(lookup)s %(date_field)s "
-"determinado."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "y"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Ya existe un/a %(model_name)s con este/a %(field_label)s."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "Ya existe un/a %(model_name)s con este/a %(field_labels)s."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr "El valor %(value)r no es una opción válida."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Este campo no puede ser nulo."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Este campo no puede estar en blanco."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Ya existe un/a %(model_name)s con este/a %(field_label)s."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s debe ser único/a para un %(lookup_type)s "
+"%(date_field_label)s determinado."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo tipo: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Entero"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr "El valor de '%(value)s' debe ser un número entero."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr "El valor de '%(value)s' debe ser Verdadero o Falso."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadero o Falso)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
@@ -492,7 +534,7 @@
"El valor de '%(value)s' tiene un formato de fecha inválido. Debe usar el "
"formato AAAA-MM-DD."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
@@ -501,11 +543,11 @@
"El valor de '%(value)s' tiene un formato de fecha correcto (AAAA-MM-DD) pero "
"representa una fecha inválida."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
@@ -514,7 +556,7 @@
"El valor de '%(value)s' tiene un formato inválido. Debe usar el formato AAAA-"
"MM-DD HH:MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
@@ -523,79 +565,79 @@
"El valor de '%(value)s' tiene un formato correcto (AAAA-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ]) pero representa una fecha/hora inválida."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Fecha (con hora)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr "El valor de '%(value)s' debe ser un número decimal."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Dirección de correo electrónico"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Ruta de archivo"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr "El valor de '%(value)s' debe ser un número de coma flotante."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Número de punto flotante"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Entero grande (8 bytes)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Dirección IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Dirección IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr "El valor de '%(value)s' debe ser None, Verdadero o Falso."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Entero positivo"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Entero pequeño positivo"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (de hasta %(max_length)s caracteres)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Entero pequeño"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
@@ -604,7 +646,7 @@
"El valor de '%(value)s' tiene un formato inválido. Debe usar el formato HH:MM"
"[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
@@ -613,71 +655,71 @@
"El valor de '%(value)s' tiene un formato correcto (HH:MM[:ss[.uuuuuu]]) pero "
"representa una hora inválida."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Datos binarios crudos"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Archivo"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Imagen"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
"No existe una instancia del modelo %(model)s con una clave primaria %(pk)r."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Clave foránea (el tipo está determinado por el campo relacionado)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Relación uno-a-uno"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Relación muchos-a-muchos"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Este campo es obligatorio."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Introduzca un número."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "Asegúrese de que no exista en total mas de %(max)s dígito."
msgstr[1] "Asegúrese de que no existan en total mas de %(max)s dígitos."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] "Asegúrese de que no exista mas de %(max)s lugar decimal."
msgstr[1] "Asegúrese de que no existan mas de %(max)s lugares decimales."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -688,32 +730,32 @@
msgstr[1] ""
"Asegúrese de que no existan mas de %(max)s dígitos antes del punto decimal."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Introduzca un valor de hora válido."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Introduzca un valor de fecha/hora válido."
-#: forms/fields.py:539
+#: forms/fields.py:564
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."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "No se envió ningún archivo."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "El archivo enviado está vacío."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -725,35 +767,39 @@
"Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracteres "
"(tiene %(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Por favor envíe un archivo o active el checkbox, pero no ambas cosas."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
"Seleccione una imagen válida. El archivo que ha seleccionado no es una "
-"imagen o es un un archivo de imagen corrupto."
+"imagen o es un archivo de imagen corrupto."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, 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."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Introduzca un valor completo."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(Campo oculto %(name)s) %(error)s"
@@ -761,43 +807,50 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
"Los datos correspondientes al ManagementForm no existen o han sido "
"modificados"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "Por favor envíe cero o %d formularios."
msgstr[1] "Por favor envíe un máximo de %d formularios."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Por favor envíe un máximo de %d formularios."
+msgstr[1] "Por favor envíe un máximo de %d formularios."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ordenar"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor, corrija la información duplicada en %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Por favor corrija la información duplicada en %(field)s, que debe ser única."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -806,35 +859,35 @@
"Por favor corrija la información duplicada en %(field_name)s que debe ser "
"única para el %(lookup)s en %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clave foránea del modelo inline no coincide con la clave primaria de la "
"instancia padre."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Seleccione una opción válida. La opción seleccionada no es una de las "
"disponibles."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" no es un valor válido para una clave primaria."
-#: forms/models.py:1158
+#: forms/models.py:1205
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."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -843,15 +896,15 @@
"%(datetime)s no puede ser interpretado en la zona horaria "
"%(current_timezone)s; ya que podría ser ambiguo o podría no existir."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Actualmente"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Eliminar"
@@ -867,63 +920,63 @@
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "si,no,talvez"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "medianoche"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "mediodía"
@@ -1199,119 +1252,148 @@
msgid "December"
msgstr "Diciembre"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "No se han podido importar las bibliotecas Pillow o PIL: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "No se ha podido importar el módulo '_imaging' de PIL: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "Esta no es una direción IPv6 válida."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d año"
msgstr[1] "%d años"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d mes"
msgstr[1] "%d meses"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d día"
msgstr[1] "%d días"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minutos"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr ""
-"No está habilitada la generación de listados de directorios en esta "
-"ubicación."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Prohibido"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "Verificación CSRF fallida. Petición abortada."
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" no existe"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Ud. está viendo este mensaje porque este sitio HTTPS tiene como "
+"requerimiento que su browser Web envíe una cabecera 'Referer' pero el mismo "
+"no ha enviado una. El hecho de que esta cabecera sea obligatoria es una "
+"medida de seguridad para comprobar que su browser no está siendo controlado "
+"por terceros."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Listado de %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Si ha configurado su browser para deshabilitar las cabeceras 'Referer', por "
+"favor activelas al menos para este sitio, o para conexiones HTTPS o para "
+"peticiones generadas desde el mismo origen."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Ud. está viendo este mensaje porque este sitio tiene como requerimiento el "
+"uso de una 'cookie' CSRF cuando se envíen formularios. El hecho de que esta "
+"'cookie' sea obligatoria es una medida de seguridad para comprobar que su "
+"browser no está siendo controlado por terceros."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Si ha configurado su browser para deshabilitar 'cookies', por favor "
+"activelas al menos para este sitio o para peticiones generadas desde el "
+"mismo origen."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Hay mas información disponible. Para ver la misma use DEBUG=True."
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "No se ha especificado el valor año"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "No se ha especificado el valor mes"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "No se ha especificado el valor día"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "No se ha especificado el valor semana"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "No hay %(verbose_name_plural)s disponibles"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1320,7 +1402,7 @@
"No hay %(verbose_name_plural)s futuros disponibles porque %(class_name)s."
"allow_future tiene el valor False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Cadena de fecha inválida '%(datestr)s', formato '%(format)s'"
@@ -1330,16 +1412,32 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "No se han encontrado %(verbose_name)s que coincidan con la consulta "
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Página debe tener el valor 'last' o un valor número entero."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Página inválida (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Lista vacía y '%(class_name)s.allow_empty' tiene el valor False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr ""
+"No está habilitada la generación de listados de directorios en esta "
+"ubicación."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" no existe"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Listado de %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/es_MX/formats.py python-django-1.7.4/django/conf/locale/es_MX/formats.py
--- python-django-1.6.6/django/conf/locale/es_MX/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/es_MX/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -24,5 +24,5 @@
'%d/%m/%y %H:%M',
)
DECIMAL_SEPARATOR = '.' # ',' is also official (less common): NOM-008-SCFI-2002
-THOUSAND_SEPARATOR = '\xa0' # non-breaking space
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
NUMBER_GROUPING = 3
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/es_MX/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/es_MX/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/es_MX/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/es_MX/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/es_MX/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/es_MX/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -5,11 +5,11 @@
# zodman , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-11-07 00:27+0000\n"
-"Last-Translator: Abraham Estrada \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
"language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -27,6 +27,10 @@
msgstr "Árabe"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azerbaijani"
@@ -79,320 +83,348 @@
msgstr "Inglés"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Inglés británico"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Español"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Español de Argentina"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Español de México"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Español de nicaragua"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "español de Venezuela"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estonio"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Vasco"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finés"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Francés"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frisón"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Irlandés"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Gallego"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebreo"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Croata"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Húngaro"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonesio"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Islandés"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japonés"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Georgiano"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazajstán"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Coreano"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "luxemburgués"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Lituano"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Letón"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Macedonio"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongol"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "burmés"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Noruego Bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepal"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Holandés"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Noruego Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "osetio"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Polaco"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugués"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Portugués de Brasil"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Rumano"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Ruso"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Eslovaco"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Esloveno"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albanés"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbio"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Latin Serbio"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Sueco"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Tailandés"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turco"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatar"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "udmurto"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ucraniano"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vietnamita"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Chino simplificado"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Chino tradicional"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Introduzca un valor válido."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Ingrese una URL válida."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr "Introduzca un número entero válido."
+msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Introduzca una dirección de correo electrónico válida."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Introduzca un \"slug\", compuesto por letras, números, guiones bajos o "
"medios."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Introduzca una dirección IPv6 válida."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Introduzca una dirección IPv4 o IPv6 válida."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Introduzca sólo números separados por comas."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Asegúrese de que este valor es %(limit_value)s (es %(show_value)s )."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor sea menor o igual a %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor sea mayor o igual a %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -407,7 +439,7 @@
"Asegúrese de que este valor tenga como mínimo %(limit_value)d caracteres "
"(tiene %(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -418,250 +450,255 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"%(field_name)s debe ser único/a para un %(lookup)s %(date_field)s "
-"determinado."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "y"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Ya existe un/a %(model_name)s con este/a %(field_label)s."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Este campo no puede ser nulo."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Este campo no puede estar en blanco."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Ya existe un/a %(model_name)s con este/a %(field_label)s."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo tipo: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Entero"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boolean (Verdadero o Falso)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Fecha (con hora)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Dirección de correo electrónico"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Ruta de archivo"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Número de punto flotante"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Entero grande (8 bytes)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Dirección IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Dirección IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Entero positivo"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Entero positivo pequeño"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (hasta %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Entero pequeño"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Archivo"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Imagen"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-"No existe una instancia del modelo %(model)s con una clave primaria %(pk)r."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Clave foránea (el tipo está determinado por el campo relacionado)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Relación uno-a-uno"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Relación muchos-a-muchos"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Este campo es obligatorio."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Introduzca un número."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -670,32 +707,32 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Introduzca una hora válida."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Introduzca una fecha/hora válida."
-#: forms/fields.py:539
+#: forms/fields.py:564
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."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "No se envió ningún archivo."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "El archivo enviado está vacío."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -703,11 +740,11 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Por favor envíe un archivo o marque la casilla, no ambos."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -715,23 +752,27 @@
"Seleccione una imagen válida. El archivo que ha seleccionado no es una "
"imagen o es un un archivo de imagen corrupto."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, 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."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -739,43 +780,48 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-"Los datos correspondientes al ManagementForm no existen o han sido "
-"modificados"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ordenar"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor, corrija la información duplicada en %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Por favor corrija la información duplicada en %(field)s, que debe ser única."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -784,35 +830,35 @@
"Por favor corrija la información duplicada en %(field_name)s que debe ser "
"única para el %(lookup)s en %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clave foránea del modelo inline no coincide con la clave primaria de la "
"instancia padre."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Seleccione una opción válida. La opción seleccionada no es una de las "
"disponibles."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Mantenga presionada \"Control\", o \"Command\" en una Mac, para seleccionar "
"más de uno."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -821,15 +867,15 @@
"La fecha %(datetime)s no puede se interpretada en la zona horaria "
"%(current_timezone)s; ya que puede ser ambigua o que no pueden existir."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Actualmente"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Borrar"
@@ -845,63 +891,63 @@
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "sí, no, tal vez"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "medianoche"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "mediodía"
@@ -1177,117 +1223,133 @@
msgid "December"
msgstr "Diciembre"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr "Esta no es una dirección IPv6 válida."
+msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ","
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d año"
msgstr[1] "%d años"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d mes"
msgstr[1] "%d meses"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d día"
msgstr[1] "%d días"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minutos"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Los índices del directorio no están permitidos."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" no existe"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Índice de %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "No se ha especificado el valor año"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "No se ha especificado el valor mes"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "No se ha especificado el valor dia"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "No se ha especificado el valor semana"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "No hay %(verbose_name_plural)s disponibles"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1296,7 +1358,7 @@
"No hay %(verbose_name_plural)s futuros disponibles porque %(class_name)s."
"allow_future tiene el valor False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Cadena de fecha inválida '%(datestr)s', formato '%(format)s'"
@@ -1306,16 +1368,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "No se han encontrado %(verbose_name)s que coincidan con la consulta"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "La página no es \"last\", ni puede ser convertido a un int."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Página inválida (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Lista vacía y '%(class_name)s.allow_empty' tiene el valor False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Los índices del directorio no están permitidos."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" no existe"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Índice de %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/es_NI/formats.py python-django-1.7.4/django/conf/locale/es_NI/formats.py
--- python-django-1.6.6/django/conf/locale/es_NI/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/es_NI/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -10,10 +10,10 @@
MONTH_DAY_FORMAT = r'j \d\e F'
SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
-FIRST_DAY_OF_WEEK = 1 # Monday: ISO 8601
+FIRST_DAY_OF_WEEK = 1 # Monday: ISO 8601
DATE_INPUT_FORMATS = (
- '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
- '%Y%m%d', # '20061025'
+ '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
+ '%Y%m%d', # '20061025'
)
DATETIME_INPUT_FORMATS = (
@@ -27,4 +27,3 @@
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
NUMBER_GROUPING = 3
-
diff -Nru python-django-1.6.6/django/conf/locale/es_PR/formats.py python-django-1.7.4/django/conf/locale/es_PR/formats.py
--- python-django-1.6.6/django/conf/locale/es_PR/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/es_PR/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -10,7 +10,7 @@
MONTH_DAY_FORMAT = r'j \d\e F'
SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
-FIRST_DAY_OF_WEEK = 0 # Sunday
+FIRST_DAY_OF_WEEK = 0 # Sunday
DATE_INPUT_FORMATS = (
# '31/12/2009', '31/12/09'
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/es_VE/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/es_VE/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/es_VE/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/es_VE/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/es_VE/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/es_VE/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -4,10 +4,10 @@
# Sebastián Ramírez Magrí , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:51+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/"
"django/language/es_VE/)\n"
@@ -26,6 +26,10 @@
msgstr "Árabe"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr ""
@@ -78,320 +82,348 @@
msgstr "Inglés"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Inglés Británic"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Español"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Español de Argentina"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr ""
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estonio"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Vazco"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finlandés"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Francés"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frisio"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Irlandés"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galés"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebreo"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Croata"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Húngaro"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonesio"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Islandés"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japonés"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Georgiano"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Canarés"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Coreano"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Lituano"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Latvio"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Macedonio"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayala"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongol"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Noruego Bokmål"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Holandés"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Polaco"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugués"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Portugués de Brasil"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Ruman"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Ruso"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Eslovaco"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Eslovenio"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albano"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbi"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Latín Serbio"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Sueco"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr ""
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Tailandés"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turco"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr ""
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ucranio"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vietnamita"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Chino simplificado"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Chino tradicional"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Introduzca un valor válido."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Introduzca un 'slug' válido, consistente de letras, números, guiones bajos o "
"guiones."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida"
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr ""
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Introduzca solo dígitos separados por comas."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Asegúrese de que este valor %(limit_value)s (ahora es %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor es menor o igual que %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor es mayor o igual que %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -402,7 +434,7 @@
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -413,247 +445,255 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr ""
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr ""
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr ""
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr ""
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr ""
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr ""
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr ""
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr ""
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr ""
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr ""
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr ""
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr ""
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Dirección IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (True, False o None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr ""
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr ""
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr ""
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Clave foránea (tipo determinado por el campo relacionado)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Relación uno a uno"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Relación muchos a muchos"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Este campo es obligatorio."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Introduzca un número completo."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Introduzca un número"
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -662,32 +702,32 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Introduzca una hora válida."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Introduzca una hora y fecha válida."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"No se envió archivo alguno. Revise el tipo de codificación del formulario."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "No se envió ningún archivo."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "El archivo enviado está vacío"
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -695,31 +735,35 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Por favor provea un archivo o active el selector de limpiar, no ambos."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr ""
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -727,86 +771,93 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr ""
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr ""
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
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."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr ""
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr ""
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr ""
@@ -822,63 +873,63 @@
msgid "No"
msgstr ""
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr ""
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr ""
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr ""
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr ""
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr ""
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr ""
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr ""
@@ -1154,124 +1205,140 @@
msgid "December"
msgstr ""
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ""
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
+#: views/csrf.py:105
+msgid "Forbidden"
msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
msgstr ""
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr ""
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr ""
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr ""
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1281,16 +1348,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
diff -Nru python-django-1.6.6/django/conf/locale/et/formats.py python-django-1.7.4/django/conf/locale/et/formats.py
--- python-django-1.6.6/django/conf/locale/et/formats.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/et/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -7,18 +7,18 @@
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'j F Y'
TIME_FORMAT = 'G:i:s'
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'd.m.Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = ' ' # Non-breaking space
-# NUMBER_GROUPING =
+THOUSAND_SEPARATOR = ' ' # Non-breaking space
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/et/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/et/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/et/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/et/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/et/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/et/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -3,15 +3,17 @@
# Translators:
# eallik , 2011
# Jannis Leidel , 2011
-# jannolii , 2013
+# Janno Liivak , 2013-2014
# madisvain , 2011
+# Martin , 2014
+# Marti Raudsepp , 2014
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-11-06 09:55+0000\n"
-"Last-Translator: jannolii \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-09-05 12:00+0000\n"
+"Last-Translator: Marti Raudsepp \n"
"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
"et/)\n"
"MIME-Version: 1.0\n"
@@ -29,8 +31,12 @@
msgstr "araabia"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "astuuria"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
-msgstr "Aserbaidžaani"
+msgstr "aserbaidžaani"
#: conf/global_settings.py:54
msgid "Bulgarian"
@@ -81,319 +87,347 @@
msgstr "inglise"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "austraalia inglise"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "briti inglise"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "hispaania"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "argentiina hispaani"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "mehhiko hispaania"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "nikaraagua hispaania"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "venetsueela hispaania"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "eesti"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "baski"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "pärsia"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "soome"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "prantsuse"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "friisi"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "iiri"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "galiitsia"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "heebrea"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "horvaatia"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "ungari"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "indoneesi"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr "ido"
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "islandi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "itaalia"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "jaapani"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "gruusia"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "kasahhi"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "khmeri"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "korea"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "letseburgi"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "leedu"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "läti"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "makedoonia"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "malaia"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "mongoolia"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr "marathi"
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "birma"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "norra (bokmal)"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "nepali"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "hollandi"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "norra (nynorsk)"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "osseetia"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "pandžab"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "poola"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "portugali"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "brasiilia portugali"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "rumeenia"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "vene"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "slovaki"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "sloveeni"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "albaania"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "serbia"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "serbia (ladina)"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "rootsi"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "suahiili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "tamiili"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "tai"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "türgi"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "tatari"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "udmurdi"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ukrania"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "vietnami"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "lihtsustatud hiina"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "traditsiooniline hiina"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Saidikaardid"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Staatilised failid"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Sündikeerimine"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Veebidisain"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Sisestage korrektne väärtus."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Sisestage korrektne URL."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr "Sisestage korrektne täisarv."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Sisestage korrektne e-posti aadress."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"See väärtus võib sisaldada ainult tähti, nubmreid, alljooni ja sidekriipse."
+"See väärtus võib sisaldada ainult tähti, numbreid, alljooni ja sidekriipse."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Sisestage korrektne IPv4 aadress."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Sisestage korrektne IPv6 aadress."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Sisestage korrektne IPv4 või IPv6 aadress."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Sisestage ainult komaga eraldatud numbreid."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Veendu, et see väärtus on %(limit_value)s (hetkel on %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Veendu, et see väärtus on väiksem või võrdne kui %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Veendu, et see väärtus on suurem või võrdne kui %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -408,7 +442,7 @@
"Väärtuses peab olema vähemalt %(limit_value)d tähemärki (praegu on "
"%(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -423,66 +457,76 @@
"Väärtuses võib olla kõige rohkem %(limit_value)d tähemärki (praegu on "
"%(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s peab olema unikaalne %(date_field)s %(lookup)s suhtes."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "ja"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Sellise %(field_label)s-väljaga %(model_name)s on juba olemas."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s väljaga %(field_labels)s on juba olemas."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr "Väärtus %(value)r ei ole kehtiv valik."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "See lahter ei tohi olla tühi."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "See väli ei saa olla tühi."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Sellise %(field_label)s-väljaga %(model_name)s on juba olemas."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s peab olema unikaalne %(date_field_label)s %(lookup_type)s "
+"suhtes."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Lahter tüüpi: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Täisarv"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr "'%(value)s' väärtus peab olema täisarv."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr "'%(value)s' väärtus peab olema kas tõene või väär."
+msgstr "'%(value)s' väärtus peab olema kas Tõene või Väär."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Tõeväärtus (Kas tõene või väär)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (kuni %(max_length)s märki)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Komaga eraldatud täisarvud"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
@@ -491,7 +535,7 @@
"'%(value)s' väärtusel on vale kuupäevaformaat. See peab olema kujul AAAA-KK-"
"PP."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
@@ -499,11 +543,11 @@
msgstr ""
"'%(value)s' väärtusel on õige formaat (AAAA-KK-PP), kuid kuupäev on vale."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Kuupäev (kellaajata)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
@@ -512,7 +556,7 @@
"'%(value)s' väärtusel on vale formaat. Peab olema formaadis AAAA-KK-PP HH:MM"
"[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
@@ -521,79 +565,79 @@
"'%(value)s' väärtusel on õige formaat (AAAA-KK-PP HH:MM[:ss[.uuuuuu]][TZ]), "
"kuid kuupäev/kellaaeg on vale."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Kuupäev (kellaajaga)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr "'%(value)s' väärtus peab olema kümnendarv."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Kümnendmurd"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "E-posti aadress"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Faili asukoht"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr "'%(value)s' väärtus peab olema ujukomaarv."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Ujukomaarv"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Suur (8 baiti) täisarv"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 aadress"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP aadress"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr "'%(value)s' väärtus peab olema kas Puudub, Tõene või Väär."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Tõeväärtus (Kas tõene, väär või tühi)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Positiivne täisarv"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Positiivne väikene täisarv"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Nälk (kuni %(max_length)s märki)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Väike täisarv"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
@@ -602,7 +646,7 @@
"'%(value)s' väärtusel on vale formaat. Peab olema formaadis HH:MM[:ss[."
"uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
@@ -611,70 +655,70 @@
"'%(value)s' väärtusel on õige formaat (HH:MM[:ss[.uuuuuu]]), kuid kellaaeg "
"on vale."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Aeg"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Töötlemata binaarandmed"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Fail"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Pilt"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr "%(model)s isendit primaarvõtmega %(pk)r ei leidu."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Välisvõti (tüübi määrab seotud väli) "
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Üks-ühele seos"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Mitu-mitmele seos"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "See lahter on nõutav."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Sisestage täisarv."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Sisestage arv."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "Veenduge, et kogu numbrikohtade arv ei oleks suurem kui %(max)s."
msgstr[1] "Veenduge, et kogu numbrikohtade arv ei oleks suurem kui %(max)s."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] "Veenduge, et komakohtade arv ei oleks suurem kui %(max)s."
msgstr[1] "Veenduge, et komakohtade arv ei oleks suurem kui %(max)s."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -685,31 +729,31 @@
msgstr[1] ""
"Veenduge, et komast vasakul olevaid numbreid ei oleks rohkem kui %(max)s."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Sisestage korrektne kuupäev."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Sisestage korrektne kellaaeg."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Sisestage korrektne kuupäev ja kellaaeg."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ühtegi faili ei saadetud. Kontrollige vormi kodeeringutüüpi."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Ühtegi faili ei saadetud."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Saadetud fail on tühi."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -721,11 +765,11 @@
"Veenduge, et faili nimes poleks rohkem kui %(max)d märki (praegu on "
"%(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Palun laadige fail või märgistage 'tühjenda' kast, mitte mõlemat."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -733,21 +777,25 @@
"Laadige korrektne pilt. Fail, mille laadisite, ei olnud kas pilt või oli "
"fail vigane."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Valige korrektne väärtus. %(value)s ei ole valitav."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Sisestage väärtuste nimekiri."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Sisestage täielik väärtus."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(Peidetud väli %(name)s) %(error)s"
@@ -755,41 +803,48 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr "ManagementForm andmed on kadunud või nendega on keegi midagi teinud"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "Palun kinnitage %d või vähem vormi."
msgstr[1] "Palun kinnitage %d või vähem vormi."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Palun kinnitage %d või rohkem vormi."
+msgstr[1] "Palun kinnitage %d või rohkem vormi."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Järjestus"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Kustuta"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Palun parandage duplikaat-andmed lahtris %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Palun parandage duplikaat-andmed lahtris %(field)s, mis peab olema unikaalne."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -798,29 +853,29 @@
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Palun parandage allolevad duplikaat-väärtused"
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Pesastatud välisvõti ei sobi ülemobjekti primaarvõtmega."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Valige korrektne väärtus. Valitud väärtus ei ole valitav."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" ei ole sobiv väärtus primaarvõtmeks."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Et valida mitu, hoidke all \"Control\"-nuppu (Maci puhul \"Command\")."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -829,15 +884,15 @@
"%(datetime)s ei saanud tõlgendada ajavööndis %(current_timezone)s; see on "
"kas puudu või mitmetähenduslik."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Hetkel"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Muuda"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Tühjenda"
@@ -853,63 +908,63 @@
msgid "No"
msgstr "Ei"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "jah,ei,võib-olla"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bait"
msgstr[1] "%(size)d baiti"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s kB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.l."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "e.l."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PL"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "EL"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "südaöö"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "keskpäev"
@@ -1185,117 +1240,145 @@
msgid "December"
msgstr "detsember"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "Ei õnnestunud importida ei Pillow'it ega PIL'i: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "Ei õnnestunud importida PIL'i moodulit '_imaging' : %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "See ei ole korrektne IPv6 aadress."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "või"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d aasta"
msgstr[1] "%d aastat"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d kuu"
msgstr[1] "%d kuud"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d nädal"
msgstr[1] "%d nädalat"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d päev"
msgstr[1] "%d päeva"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d tund"
msgstr[1] "%d tundi"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minut"
msgstr[1] "%d minutit"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minutit"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Kausta sisuloendid ei ole siin lubatud."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Keelatud"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "CSRF verifitseerimine ebaõnnestus. Päring katkestati."
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" ei eksisteeri"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Näete seda sõnumit, kuna käesolev HTTPS leht nõuab 'Viitaja päise' saatmist "
+"teie brauserile, kuid seda ei saadetud. Seda päist on vaja "
+"turvakaalutlustel, kindlustamaks et teie brauserit ei ole kolmandate "
+"osapoolte poolt üle võetud."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "%(directory)s sisuloend"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Kui olete oma brauseri seadistustes välja lülitanud 'Viitaja' päised siis "
+"lülitage need taas sisse vähemalt antud lehe jaoks või HTTPS üheduste jaoks "
+"või 'sama-allika' päringute jaoks."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Näete seda teadet, kuna see leht vajab CSRF küpsist vormide postitamiseks. "
+"Seda küpsist on vaja turvakaalutlustel, kindlustamaks et teie brauserit ei "
+"ole kolmandate osapoolte poolt üle võetud."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Kui olete oma brauseris küpsised keelanud, siis palun lubage need vähemalt "
+"selle lehe jaoks või 'sama-allika' päringute jaoks."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Saadaval on rohkem infot kasutades DEBUG=True"
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Aasta on valimata"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Kuu on valimata"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Päev on valimata"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Nädal on valimata"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Ei leitud %(verbose_name_plural)s"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1304,7 +1387,7 @@
"Tulevane %(verbose_name_plural)s pole saadaval, sest %(class_name)s."
"allow_future on False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Vigane kuupäeva-string '%(datestr)s' lähtudes formaadist '%(format)s'"
@@ -1314,16 +1397,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Päringule vastavat %(verbose_name)s ei leitud"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Lehekülg ei ole 'last', ka ei saa teda konvertida täisarvuks."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Vigane leht (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Tühi list ja '%(class_name)s.allow_empty' on False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Kausta sisuloendid ei ole siin lubatud."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ei eksisteeri"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s sisuloend"
diff -Nru python-django-1.6.6/django/conf/locale/eu/formats.py python-django-1.7.4/django/conf/locale/eu/formats.py
--- python-django-1.6.6/django/conf/locale/eu/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/eu/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -7,18 +7,18 @@
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = r'Yeko M\re\n d\a'
TIME_FORMAT = 'H:i:s'
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
-# MONTH_DAY_FORMAT =
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
+# MONTH_DAY_FORMAT =
SHORT_DATE_FORMAT = 'Y M j'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/eu/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/eu/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/eu/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/eu/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/eu/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/eu/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,20 +2,20 @@
#
# Translators:
# Aitzol Naberan , 2013
-# Ander Martínez , 2013
+# ander , 2013-2014
# Jannis Leidel , 2011
# jazpillaga , 2011
# julen , 2011-2012
# julen , 2013
# totorika93 , 2012
-# unaizalakain , 2013
+# Unai Zalakain , 2013
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-10-31 11:28+0000\n"
-"Last-Translator: Aitzol Naberan \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
"eu/)\n"
"MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@
msgstr "Arabiera"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azerbaianera"
@@ -85,321 +89,349 @@
msgstr "Ingelesa"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Ingelesa"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperantoa"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Espainola"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Espainola (Argentina)"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Espainola (Mexiko)"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Espainola (Nikaragua)"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Venezuelako gaztelera"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estoniera"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Euskara"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persiera"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finlandiera"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Frantsesa"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frisiera"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Irlandako gaelera"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galiziera"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebreera"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Kroaziarra"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Hungariera"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonesiera"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Islandiera"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Italiera"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japoniera"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Georgiera"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazakhera"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khemerera"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kanadiera"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Koreera"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Luxenburgera"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Lituaniera"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Letoniera"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Mazedoniera"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malabarera"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongoliera"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "Birmaniera"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepalera"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Holandera"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "Osetiera"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Punjabera"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Poloniera"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugalera"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Portugalera (Brazil)"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Errumaniera"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Errusiera"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Eslovakiera"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Esloveniera"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albaniera"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbiera"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serbiera"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Suediera"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahilia"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamilera"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telegu hizkuntza"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Thailandiera"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turkiera"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatarera"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Udmurt"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ukrainera"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdua"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vietnamamera"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Txinera (sinpletua)"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Txinera (tradizionala)"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Idatzi balio zuzena."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Idatzi baliozko URL bat."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr "Sartu baliozko osoko zenbakia."
+msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Gehitu baleko email helbide bat"
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Idatzi hizki, zenbaki, azpimarra edo marratxoz osatutako baleko 'slug' bat."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Sartu IPv4 helbide zuzena."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Sartu IPv6 helbide zuzena"
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Sartu IPv4 edo IPv6 helbide zuzena."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Idatzi komaz bereizitako digitoak soilik."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Ziurtatu balioak %(limit_value)s gutxienez karaktere dituela (orain "
"%(show_value)s dauzka)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Ziurtatu balio hau %(limit_value)s baino txikiagoa edo berdina dela."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Ziurtatu balio hau %(limit_value)s baino handiagoa edo berdina dela."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -414,7 +446,7 @@
"Ziurtatu balio honek gutxienez %(limit_value)d karaktere dituela "
"(%(show_value)d ditu)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -429,263 +461,255 @@
"Ziurtatu balio honek gehienez %(limit_value)d karaktere dituela "
"(%(show_value)d ditu)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"%(date_field)s eremuan %(lookup)s egiteko %(field_name)s bakarra izan behar "
-"da."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "eta"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(field_label)s hori daukan %(model_name)s dagoeneko existitzen da."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
-msgstr "%(value)r balioa ez da baliozko aukera."
+msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Eremu hau ezin daiteke hutsa izan (null)."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Eremu hau ezin da hutsik egon."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(field_label)s hori daukan %(model_name)s dagoeneko existitzen da."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Eremuaren mota: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Zenbaki osoa"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr "'%(value)s' balioak osoko zenbakia izan behar du."
+msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr "'%(value)s' balioak True edo False izan behar du."
+msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boolearra (egia ala gezurra)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Katea (%(max_length)s gehienez)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Komaz bereiztutako zenbaki osoak"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-"'%(value)s' balioak ez dauka data formatu zuzena. Formatu zuzena UUUU-HH-EE "
-"da."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-"'%(value)s' balioak formatu zuzena (UUUU-HH-EE) dauka, baina ez da data "
-"zuzen bat."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Data (ordurik gabe)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-"'%(value)s' balioak ez dauka formatu zuzena. Formatu zuzena UUUU-HH-EE .\n"
-"OO:MM[:ss[.uuuuuu]][TZ] da."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-"'%(value)s' balioak formatu zuzena dauka (UUUU-HH-EE OO:MM[:ss[.uuuuuu]]"
-"[TZ]),\n"
-"baina ez da data/ordu zuzena."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Data (orduarekin)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
-msgstr "'%(value)s' balioak zenbaki hamartarra izan behar du."
+msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Zenbaki hamartarra"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Eposta helbidea"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Fitxategiaren bidea"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
-msgstr "'%(value)s' balioak koma higikorreko zenbakia izan behar du."
+msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Koma higikorreko zenbakia (float)"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Zenbaki osoa (handia 8 byte)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 helbidea"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP helbidea"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr "'%(value)s' balioa None, True edo False izan behar da."
+msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boolearra (egia, gezurra edo hutsa[None])"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Osoko positiboa"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Osoko positibo txikia"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (gehienez %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Osoko txikia"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Testua"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-"'%(value)s' balioak ez dauka formatu zuzena. OO:MM[:ss[.uuuuuu]] fotmatuan "
-"egon behar da."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-"'%(value)s' balioak formatu zuzena dauka (OO:MM[:ss[.uuuuuu]]) baina ez da "
-"ordu \n"
-"zuzena"
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Ordua"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Datu bitar gordinak"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Fitxategia"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Irudia"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
-msgstr "Ez dago %(pk)r gakoa duen %(model)s instantziarik."
+msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "1-N (mota erlazionatutako eremuaren arabera)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Bat-bat erlazioa"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "M:N erlazioa"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Eremu hau beharrezkoa da."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Idatzi zenbaki oso bat."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Idatzi zenbaki bat."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "Ziurtatu digitu %(max)s baino gehiago ez dagoela guztira."
msgstr[1] "Ziurtatu %(max)s digitu baino gehiago ez dagoela guztira."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] "Ziurtatu ez dagoela digitu %(max)s baino gehiago komaren atzetik."
msgstr[1] "Ziurtatu ez dagoela %(max)s digitu baino gehiago komaren atzetik."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -694,31 +718,31 @@
msgstr[0] "Ziurtatu ez dagoela digitu %(max)s baino gehiago komaren aurretik."
msgstr[1] "Ziurtatu ez dagoela %(max)s digitu baino gehiago komaren aurretik."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Idatzi baliozko data bat."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Idatzi baliozko ordu bat."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Idatzi baliozko data/ordua."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ez da fitxategirik bidali. Egiaztatu inprimakiaren kodeketa-mota."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Ez da fitxategirik bidali."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Bidalitako fitxategia hutsik dago."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -730,11 +754,11 @@
"Ziurtatu fitxategi izen honek gehienez %(max)d karaktere dituela (%(length)d "
"ditu)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Mesedez, igo fitxategi bat edo egin klik garbitu botoian, ez biak."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -742,21 +766,25 @@
"Bidali baliozko irudia. Zuk bidalitako fitxategia ez da irudia edo akatsa "
"dauka."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Hautatu baliozko aukera bat. %(value)s ez dago erabilgarri."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Idatzi balio-zerrenda bat."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(%(name)s eremu ezkutua) %(error)s"
@@ -764,40 +792,47 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "Bidali inprimaki %d ala gutxiago, mesedez."
msgstr[1] "Bidali %d inprimaki ala gutxiago, mesedez."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ordena"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Ezabatu"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Zuzendu bikoiztketa %(field)s eremuan."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Zuzendu bikoizketa %(field)s eremuan. Bakarra izan behar da."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -806,31 +841,31 @@
"Zuzendu bakarra izan behar den%(field_name)s eremuarentzako bikoiztutako "
"data %(lookup)s egiteko %(date_field)s eremuan"
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Zuzendu hurrengo balio bikoiztuak."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Barneko gakoa eta gurasoaren gakoa ez datoz bat."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Hautatu aukera zuzen bat. Hautatutakoa ez da zuzena."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" ez da balio egokia lehen mailako gakoentzat."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Bat baino gehiago hautatzeko, sakatu \"Kontrol\" tekla edo \"Command\" Mac "
"batean."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -839,15 +874,15 @@
"%(datetime)s ezin da interpretatu %(current_timezone)s ordu-eremuan;\n"
"baliteke ez existitzea edo anbiguoa izatea"
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Orain"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Aldatu"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Garbitu"
@@ -863,63 +898,63 @@
msgid "No"
msgstr "Ez"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "bai,ez,agian"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "byte %(size)d "
msgstr[1] "%(size)d byte"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "gauerdia"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "eguerdia"
@@ -1195,117 +1230,133 @@
msgid "December"
msgstr "Abendua"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "Ezin izan da Pillow inportatu, ezta PIL ere: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "PIL liburutegiaren '_imaging' modulua ezin izan da inportatu: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr "Hau ez da baliozko IPv6 helbidea."
+msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "edo"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "urte %d"
msgstr[1] "%d urte"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "hilabete %d"
msgstr[1] "%d hilabete"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "aste %d"
msgstr[1] "%d aste"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "egun %d"
msgstr[1] "%d egun"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "ordu %d"
msgstr[1] "%d ordu"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "minutu %d"
msgstr[1] "%d minutu"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minutu"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Direktorio zerrendak ez daude baimenduak."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" ez da existitzen"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "%(directory)s zerrenda"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Ez da urterik zehaztu"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Ez da hilabeterik zehaztu"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Ez da egunik zehaztu"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Ez da asterik zehaztu"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Ez dago %(verbose_name_plural)s"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1314,7 +1365,7 @@
"Etorkizuneko %(verbose_name_plural)s ez dago aukeran \n"
"%(class_name)s.alloe_future False delako"
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "%(datestr)s data string okerra '%(format)s' formaturako"
@@ -1324,16 +1375,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Bilaketarekin bat datorren %(verbose_name)s-rik ez dago"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Orria ez da azkena, hortaz ezin da osokora (int) biurtu."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Orri baliogabea (%(page_number)s):%(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Zerrenda hutsa eta '%(class_name)s.allow_empty' False da"
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Direktorio zerrendak ez daude baimenduak."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ez da existitzen"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s zerrenda"
diff -Nru python-django-1.6.6/django/conf/locale/fa/formats.py python-django-1.7.4/django/conf/locale/fa/formats.py
--- python-django-1.6.6/django/conf/locale/fa/formats.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/fa/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,13 +12,13 @@
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'Y/n/j'
SHORT_DATETIME_FORMAT = 'Y/n/j، G:i:s'
-# FIRST_DAY_OF_WEEK =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/fa/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/fa/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/fa/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/fa/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/fa/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/fa/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -3,16 +3,17 @@
# Translators:
# Arash Fazeli , 2012
# Jannis Leidel , 2011
-# M.Hossein Mojtahedi , 2013
-# Reza Mohammadi , 2013
+# Mazdak Badakhshan , 2014
+# Mohammad Hossein Mojtahedi , 2013
+# Reza Mohammadi , 2013-2014
# Saeed , 2011
# Sina Cheraghi , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-11-05 08:50+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 09:06+0000\n"
"Last-Translator: Reza Mohammadi \n"
"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
"fa/)\n"
@@ -31,6 +32,10 @@
msgstr "عربی"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "آستوری"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "آذربایجانی"
@@ -83,318 +88,346 @@
msgstr "انگلیسی"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "انگلیسی استرالیایی"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "انگلیسی بریتیش"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "اسپرانتو"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "اسپانیایی"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "اسپانیایی آرژانتینی"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "اسپانیولی مکزیکی"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "نیکاراگوئه اسپانیایی"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "ونزوئلا اسپانیایی"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "استونی"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "باسکی"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "فارسی"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "فنلاندی"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "فرانسوی"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "فریزی"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "ایرلندی"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "گالیسیایی"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "عبری"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "هندی"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "کرواتی"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "مجاری"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "اینترلینگوا"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "اندونزیایی"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr "ایدو"
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "ایسلندی"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "ایتالیایی"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "ژاپنی"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "گرجی"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "قزاقستان"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "خمری"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "کنادهای"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "کرهای"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "لوگزامبورگی"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "لیتوانی"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "لتونیایی"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "مقدونی"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "مالایایی"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "مغولی"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr "مِراتی"
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "برمهای"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "نروژی Bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "نپالی"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "هلندی"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "نروژی Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "آسی"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "پنجابی"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "لهستانی"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "پرتغالی"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "پرتغالیِ برزیل"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "رومانی"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "روسی"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "اسلواکی"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "اسلووِنی"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "آلبانیایی"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "صربی"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "صربی لاتین"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "سوئدی"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "سواحیلی"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "تامیلی"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "تلوگویی"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "تایلندی"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "ترکی"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "تاتار"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "ادمورت"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "اکراینی"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "اردو"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "ویتنامی"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "چینی سادهشده"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "چینی سنتی"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "نقشههای وبگاه"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "پروندههای استاتیک"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "طراحی وب"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "یک مقدار معتبر وارد کنید."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "یک نشانی اینترنتی معتبر وارد کنید."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr "یک عدد معتبر وارد کنید."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "یک ایمیل آدرس معتبر وارد کنید."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "یک 'slug' معتبر شامل حروف، ارقام، خط زیر و یا خط تیره وارد کنید."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "یک نشانی IPv4 معتبر وارد کنید."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "یک آدرس معتبر IPv6 وارد کنید."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "IPv4 یا IPv6 آدرس معتبر وارد کنید."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "فقط ارقام جدا شده با کاما وارد کنید."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "مطمئن شوید مقدار %(limit_value)s است. (اکنون %(show_value)s می باشد)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "مطمئن شوید این مقدار کوچکتر و یا مساوی %(limit_value)s است."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "مطمئن شوید این مقدار بزرگتر و یا مساوی %(limit_value)s است."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -406,7 +439,7 @@
"طول این مقدار باید حداقل %(limit_value)d کاراکتر باشد (طولش %(show_value)d "
"است)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -418,66 +451,75 @@
"طول این مقدار باید حداکثر %(limit_value)d کاراکتر باشد (طولش %(show_value)d "
"است)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s باید برای %(date_field)s یکتا باشد %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "و"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s با این %(field_label)s از قبل موجود است."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s با این %(field_labels)s وجود دارد."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr "مقدار %(value)r انتخاب معتبری نیست. "
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "این فیلد نمی تواند پوچ باشد."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "این فیلد نمی تواند خالی باشد."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s با این %(field_label)s از قبل موجود است."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s باید برای %(lookup_type)s %(date_field_label)s یکتا باشد."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "فیلد با نوع: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "عدد صحیح"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr "مقدار «%(value)s» باید عدد طبیعی باشد."
+msgstr "مقدار «%(value)s» باید یک عدد باشد."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr "مقدار «%(value)s» باید یا True باشد و یا False."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "بولی (درست یا غلط)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "رشته (تا %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "اعداد صحیح جدا-شده با ویلگول"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
@@ -486,7 +528,7 @@
"مقدار تاریخ «%(value)s» در قالب نادرستی وارد شده است. باید در قالب YYYY-MM-"
"DD باشد."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
@@ -495,11 +537,11 @@
"مقدار تاریخ «%(value)s» با اینکه در قالب درستی (YYYY-MM-DD) است ولی تاریخ "
"ناممکنی را نشان میدهد."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "تاریخ (بدون زمان)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
@@ -508,7 +550,7 @@
"مقدار «%(value)s» در قالب نادرستی وارد شده است. باید در قالب YYYY-MM-DD HH:MM"
"[:ss[.uuuuuu]][TZ] باشد."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
@@ -517,79 +559,79 @@
"مقدار «%(value)s» با اینکه در قالب درستی (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) است ولی تاریخ/زمان ناممکنی را نشان میدهد."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "تاریخ (با زمان)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr "مقدار «%(value)s» باید عدد باشد."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "عدد دهدهی"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "نشانی پست الکترونیکی"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "مسیر پرونده"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr "مقدار «%(value)s» باید عدد حقیقی باشد."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "عدد اعشاری"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "بزرگ (8 بایت) عدد صحیح"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 آدرس"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "نشانی IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr "مقدار «%(value)s» باید یا None باشد یا True و یا False."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "بولی (درست، نادرست یا پوچ)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "عدد صحیح مثبت"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "مثبت عدد صحیح کوچک"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "تیتر (حداکثر %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "عدد صحیح کوچک"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "متن"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
@@ -598,7 +640,7 @@
"مقدار «%(value)s» در قالب نادرستی وارد شده است. باید در قالب HH:MM[:ss[."
"uuuuuu]] باشد."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
@@ -607,68 +649,68 @@
"مقدار «%(value)s» با اینکه در قالب درستی (HH:MM[:ss[.uuuuuu]]) است ولی زمان "
"ناممکنی را نشان میدهد."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "زمان"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "نشانی اینترنتی"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "دادهٔ دودویی خام"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "پرونده"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "تصویر"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr "%(model)s ای با کلید اصلی %(pk)r وجود ندارد."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "کلید خارجی ( نوع بر اساس فیلد رابط مشخص میشود )"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "رابطه یک به یک "
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "رابطه چند به چند"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "این فیلد لازم است."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "به طور کامل یک عدد وارد کنید."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "یک عدد وارد کنید."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "نباید در مجموع بیش از %(max)s رقم داشته باشد."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] "نباید بیش از %(max)s رقم اعشار داشته باشد."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -676,31 +718,31 @@
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] "نباید بیش از %(max)s رقم قبل ممیز داشته باشد."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "یک تاریخ معتبر وارد کنید."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "یک زمان معتبر وارد کنید."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "یک تاریخ/زمان معتبر وارد کنید."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "پروندهای ارسال نشده است. نوع کدگذاری فرم را بررسی کنید."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "پروندهای ارسال نشده است."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "پروندهٔ ارسالشده خالیست."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -708,11 +750,11 @@
msgstr[0] ""
"طول عنوان پرونده باید حداقل %(max)d کاراکتر باشد (طولش %(length)d است)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "لطفا یا فایل ارسال کنید یا دکمه پاک کردن را علامت بزنید، نه هردو."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -720,21 +762,25 @@
"یک تصویر معتبر بارگذاری کنید. پروندهای که بارگذاری کردید یا تصویر نبوده و یا "
"تصویری مخدوش بوده است."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "یک گزینهٔ معتبر انتخاب کنید. %(value)s از گزینههای موجود نیست."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "فهرستی از مقادیر وارد کنید."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "یک مقدار کامل وارد کنید."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(فیلد پنهان %(name)s) %(error)s"
@@ -742,39 +788,45 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":؟.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr "اطلاعات ManagementForm ناقص است و یا دستکاری شده است."
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "لطفاً %d یا کمتر فرم بفرستید."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "لطفاً %d یا بیشتر فرم بفرستید."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "ترتیب:"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "حذف"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "لطفا محتوی تکراری برای %(field)s را اصلاح کنید."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "لطفا محتوی تکراری برای %(field)s را که باید یکتا باشد اصلاح کنید."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -783,31 +835,31 @@
"لطفا اطلاعات تکراری %(field_name)s را اصلاح کنید که باید در %(lookup)s "
"یکتا باشد %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "لطفا مقدار تکراری را اصلاح کنید."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "کلید های درون خطی خارجی با هم مطابقت ندارند ."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "یک گزینهٔ معتبر انتخاب کنید. آن گزینه از گزینههای موجود نیست."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "«%(pk)s» مقدار معتبری برای کلید اصلی نیست."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"برای انتخاب بیش از یکی \"Control\"، یا \"Command\" روی Mac، را پایین نگه "
"دارید."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -816,15 +868,15 @@
"%(datetime)s نمیتواند در %(current_timezone)s معنی شود.شاید این زمان مبهم "
"است و یا وجود ندارد."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "در حال حاضر"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "تغییر"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "پاک کردن"
@@ -840,62 +892,62 @@
msgid "No"
msgstr "خیر"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "بله،خیر،شاید"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d بایت"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "ب.ظ."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "صبح"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "بعد از ظهر"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "صبح"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "نیمه شب"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "ظهر"
@@ -1171,111 +1223,129 @@
msgid "December"
msgstr "دسامبر"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "نه Pillow و نه PIL کار نکردند: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "ماژول '_imaging' از PIL کار نکرد: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "این مقدار آدرس IPv6 معتبری نیست."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "یا"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr "،"
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d سال"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d ماه"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d هفته"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d روز"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d ساعت"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d دقیقه"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 دقیقه"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "شاخص دایرکتوری اینجا قابل قبول نیست."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "ممنوع"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "CSRF تأیید نشد. درخواست لغو شد."
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" وجود ندارد"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "فهرست %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"چنانچه مروگرتان را طوری تنظیم کردهاید که cookie ها غیر فعال باشند، لطفاً "
+"حداقل برای این وبگاه و یا برای «same-origin» فعالش کنید."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "اطلاعات بیشتر با DEBUG=True ارائه خواهد شد."
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "هیچ سالی مشخص نشده است"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "هیچ ماهی مشخص نشده است"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "هیچ روزی مشخص نشده است"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "هیچ هفتهای مشخص نشده است"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "هیچ %(verbose_name_plural)s موجود نیست"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1284,7 +1354,7 @@
"آینده %(verbose_name_plural)s امکان پذیر نیست زیرا مقدار %(class_name)s."
"allow_future برابر False تنظیم شده است."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "متن تاریخ '%(datestr)s' با فرمت '%(format)s' غلط است."
@@ -1294,16 +1364,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "هیچ %(verbose_name)s ای مطابق جستجو پیدا نشد."
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Page مقدار 'last' نیست,همچنین قابل تبدیل به عدد هم نمیباشد."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "صفحهی اشتباه (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr " لیست خالی است و '%(class_name)s.allow_empty' برابر False است."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "شاخص دایرکتوری اینجا قابل قبول نیست."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" وجود ندارد"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "فهرست %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/fi/formats.py python-django-1.7.4/django/conf/locale/fi/formats.py
--- python-django-1.6.6/django/conf/locale/fi/formats.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/fi/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -11,14 +11,32 @@
YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j. F'
SHORT_DATE_FORMAT = 'j.n.Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+SHORT_DATETIME_FORMAT = 'j.n.Y G.i'
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+DATE_INPUT_FORMATS = (
+ '%d.%m.%Y', # '20.3.2014'
+ '%d.%m.%y', # '20.3.14'
+)
+DATETIME_INPUT_FORMATS = (
+ '%d.%m.%Y %H.%M.%S', # '20.3.2014 14.30.59'
+ '%d.%m.%Y %H.%M.%S.%f', # '20.3.2014 14.30.59.000200'
+ '%d.%m.%Y %H.%M', # '20.3.2014 14.30'
+ '%d.%m.%Y', # '20.3.2014'
+
+ '%d.%m.%y %H.%M.%S', # '20.3.14 14.30.59'
+ '%d.%m.%y %H.%M.%S.%f', # '20.3.14 14.30.59.000200'
+ '%d.%m.%y %H.%M', # '20.3.14 14.30'
+ '%d.%m.%y', # '20.3.14'
+)
+TIME_INPUT_FORMATS = (
+ '%H.%M.%S', # '14.30.59'
+ '%H.%M.%S.%f', # '14.30.59.000200'
+ '%H.%M', # '14.30'
+)
+
DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = ' ' # Non-breaking space
-# NUMBER_GROUPING =
+THOUSAND_SEPARATOR = '\xa0' # Non-breaking space
+NUMBER_GROUPING = 3
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/fi/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/fi/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/fi/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/fi/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/fi/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/fi/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -3,13 +3,13 @@
# Translators:
# Antti Kaihola , 2011
# Jannis Leidel , 2011
-# nanook , 2011
+# Klaus Dahlén , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
"fi/)\n"
@@ -28,6 +28,10 @@
msgstr "arabia"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azeri"
@@ -80,320 +84,348 @@
msgstr "englanti"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "brittienglanti"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "espanja"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Argentiinan espanja"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Meksikon espanja"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Nicaraguan espanja"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "viro"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "baski"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "persia"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "suomi"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "ranska"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "friisi"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "irlanti"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "galicia"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "heprea"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "kroatia"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "unkari"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "indonesia"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "islanti"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "italia"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "japani"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "georgia"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "korea"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "liettua"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "latvia"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "makedonia"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "malajalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "mongolia"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "norja (kirjanorja)"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "hollanti"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "norja (uusnorja)"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "punjabin kieli"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "puola"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "portugali"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "brasilian portugali"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "romania"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "venäjä"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "slovakia"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "slovenia"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "albaani"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "serbia"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "serbian latina"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "ruotsi"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr ""
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "tamili"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "thain kieli"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "turkki"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr ""
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ukraina"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "vietnam"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "kiina (yksinkertaistettu)"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "kiina (perinteinen)"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Syötä oikea arvo."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Syötä oikea URL-osoite."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Tässä voidaan käyttää vain kirjaimia (a-z), numeroita (0-9) sekä ala- ja "
"tavuviivoja (_ -)."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Syötä kelvollinen IPv4-osoite."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr ""
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Vain pilkulla erotetut kokonaisluvut kelpaavat tässä."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Tämän arvon on oltava %(limit_value)s (nyt %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Tämän arvon on oltava enintään %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Tämän luvun on oltava vähintään %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -404,7 +436,7 @@
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -415,249 +447,255 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"\"%(field_name)s\"-kentän on oltava uniikki suhteessa: %(date_field)s "
-"%(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "ja"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s jolla on tämä %(field_label)s, on jo olemassa."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Tämän kentän arvo ei voi olla \"null\"."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Tämä kenttä ei voi olla tyhjä."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s jolla on tämä %(field_label)s, on jo olemassa."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Kenttä tyyppiä: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Kokonaisluku"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Totuusarvo: joko tosi (True) tai epätosi (False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Merkkijono (enintään %(max_length)s merkkiä)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Pilkulla erotetut kokonaisluvut"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Päivämäärä (ilman kellonaikaa)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Päivämäärä ja kellonaika"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Desimaaliluku"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Sähköpostiosoite"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Tiedostopolku"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Liukuluku"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Suuri (8-tavuinen) kokonaisluku"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr ""
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP-osoite"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Totuusarvo: joko tosi (True), epätosi (False) tai ei mikään (None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr ""
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Tekstiä"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Kellonaika"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL-osoite"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr ""
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr ""
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Vierasavain (tyyppi määräytyy liittyvän kentän mukaan)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Yksi-yhteen relaatio"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Moni-moneen relaatio"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Tämä kenttä vaaditaan."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Syötä kokonaisluku."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Syötä luku."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -666,31 +704,31 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Syötä oikea päivämäärä."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Syötä oikea kellonaika."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Syötä oikea pvm/kellonaika."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Tiedostoa ei lähetetty. Tarkista lomakkeen koodaus (encoding)."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Yhtään tiedostoa ei ole lähetetty."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Lähetetty tiedosto on tyhjä."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -698,32 +736,36 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Voit joko lähettää tai poistaa tiedoston, muttei kumpaakin samalla."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
"Kuva ei kelpaa. Lähettämäsi tiedosto ei ole kuva, tai tiedosto on vioittunut."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Valitse oikea vaihtoehto. %(value)s ei ole vaihtoehtojen joukossa."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Syötä lista."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -731,40 +773,47 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Järjestys"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Poista"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Korjaa kaksoisarvo kentälle %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Ole hyvä ja korjaa uniikin kentän %(field)s kaksoisarvo."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -773,46 +822,46 @@
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Korjaa allaolevat kaksoisarvot."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Liittyvä perusavain ei vastannut vanhemman perusavainta."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Valitse oikea vaihtoehto. Valintasi ei löydy vaihtoehtojen joukosta."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
" Pidä \"Ctrl\"-näppäin (tai Macin \"Command\") pohjassa valitaksesi useita "
"vaihtoehtoja."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Tällä hetkellä"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Muokkaa"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Poista"
@@ -828,63 +877,63 @@
msgid "No"
msgstr "Ei"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "kyllä,ei,ehkä"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d tavu"
msgstr[1] "%(size)d tavua"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "ip"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "ap"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "IP"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AP"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "keskiyö"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "keskipäivä"
@@ -1160,117 +1209,133 @@
msgid "December"
msgstr "joulukuuta"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "tai"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
+#: views/csrf.py:105
+msgid "Forbidden"
msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
msgstr ""
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Vuosi puuttuu"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Kuukausi puuttuu"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Päivä puuttuu"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Viikko puuttuu"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s: yhtään kohdetta ei löydy"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1279,7 +1344,7 @@
"%(verbose_name_plural)s: tulevia kohteita ei löydy, koska %(class_name)s."
"allow_future:n arvo on False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Päivämäärä '%(datestr)s' ei ole muotoa '%(format)s'"
@@ -1289,16 +1354,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Hakua vastaavaa %(verbose_name)s -kohdetta ei löytynyt"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Sivunumero ei ole 'last' (viimeinen) eikä näytä luvulta."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Lista on tyhjä, ja '%(class_name)s.allow_empty':n arvo on False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
diff -Nru python-django-1.6.6/django/conf/locale/fr/formats.py python-django-1.7.4/django/conf/locale/fr/formats.py
--- python-django-1.6.6/django/conf/locale/fr/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/fr/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,25 +12,25 @@
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'j N Y'
SHORT_DATETIME_FORMAT = 'j N Y H:i:s'
-FIRST_DAY_OF_WEEK = 1 # Monday
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
DATE_INPUT_FORMATS = (
- '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
- '%d.%m.%Y', '%d.%m.%y', # Swiss (fr_CH), '25.10.2006', '25.10.06'
+ '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
+ '%d.%m.%Y', '%d.%m.%y', # Swiss (fr_CH), '25.10.2006', '25.10.06'
# '%d %B %Y', '%d %b %Y', # '25 octobre 2006', '25 oct. 2006'
)
DATETIME_INPUT_FORMATS = (
- '%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'
- '%d/%m/%Y %H:%M:%S.%f', # '25/10/2006 14:30:59.000200'
- '%d/%m/%Y %H:%M', # '25/10/2006 14:30'
- '%d/%m/%Y', # '25/10/2006'
- '%d.%m.%Y %H:%M:%S', # Swiss (fr_CH), '25.10.2006 14:30:59'
- '%d.%m.%Y %H:%M:%S.%f', # Swiss (fr_CH), '25.10.2006 14:30:59.000200'
- '%d.%m.%Y %H:%M', # Swiss (fr_CH), '25.10.2006 14:30'
- '%d.%m.%Y', # Swiss (fr_CH), '25.10.2006'
+ '%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'
+ '%d/%m/%Y %H:%M:%S.%f', # '25/10/2006 14:30:59.000200'
+ '%d/%m/%Y %H:%M', # '25/10/2006 14:30'
+ '%d/%m/%Y', # '25/10/2006'
+ '%d.%m.%Y %H:%M:%S', # Swiss (fr_CH), '25.10.2006 14:30:59'
+ '%d.%m.%Y %H:%M:%S.%f', # Swiss (fr_CH), '25.10.2006 14:30:59.000200'
+ '%d.%m.%Y %H:%M', # Swiss (fr_CH), '25.10.2006 14:30'
+ '%d.%m.%Y', # Swiss (fr_CH), '25.10.2006'
)
DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = '\xa0' # non-breaking space
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
NUMBER_GROUPING = 3
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/fr/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/fr/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/fr/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/fr/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/fr/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/fr/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,17 +2,19 @@
#
# Translators:
# charettes , 2012
-# claudep , 2013
-# claudep , 2011
+# Claude Paroz , 2013-2014
+# Claude Paroz , 2011
# Jannis Leidel , 2011
+# Jean-Baptiste Mora, 2014
# Larlet davidbgk , 2011
+# Marie-Cécile Gohier , 2014
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-22 07:26+0000\n"
-"Last-Translator: claudep \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-30 16:59+0000\n"
+"Last-Translator: Marie-Cécile Gohier \n"
"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
"fr/)\n"
"MIME-Version: 1.0\n"
@@ -30,6 +32,10 @@
msgstr "Arabe"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "Asturien"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azéri"
@@ -82,324 +88,352 @@
msgstr "Anglais"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "Anglais australien"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Anglais britannique"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Espéranto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Espagnol"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Espagnol argentin"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Espagnol mexicain"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Espagnol nicaraguayen"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Espagnol vénézuélien"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estonien"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Basque"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Perse"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finlandais"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Français"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frise"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Irlandais"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galicien"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hébreu"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Croate"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Hongrois"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonésien"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr "Ido"
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Islandais"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Italien"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japonais"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Géorgien"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazakh"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Coréen"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Luxembourgeois"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Lituanien"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Letton"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Macédonien"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayâlam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongole"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr "Marathi"
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "Birman"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Norvégien Bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Népalais"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Hollandais"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Norvégien Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "Ossète"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Penjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Polonais"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugais"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Portugais brésilien"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Roumain"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Russe"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slovaque"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Slovène"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albanais"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbe"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serbe latin"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Suédois"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamoul"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Télougou"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Thaï"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turc"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatar"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Oudmourte"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ukrainien"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Ourdou"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vietnamien"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Chinois simplifié"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Chinois traditionnel"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Plans de sites"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "Fichiers statiques"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Syndication"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Conception Web"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Saisissez une valeur valide."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Saisissez une URL valide."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr "Saisissez un nombre entier valide."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Saisissez une adresse de courriel valide."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _ et "
"des traits d'union."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Saisissez une adresse IPv4 valide."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Saisissez une adresse IPv6 valide."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Saisissez une adresse IPv4 ou IPv6 valide."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Saisissez uniquement des chiffres séparés par des virgules."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Assurez-vous que cette valeur est %(limit_value)s (actuellement "
"%(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Assurez-vous que cette valeur est inférieure ou égale à %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Assurez-vous que cette valeur est supérieure ou égale à %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -414,7 +448,7 @@
"Assurez-vous que cette valeur comporte au moins %(limit_value)d caractères "
"(actuellement %(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -429,181 +463,190 @@
"Assurez-vous que cette valeur comporte au plus %(limit_value)d caractères "
"(actuellement %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"%(field_name)s doit être unique pour la partie %(lookup)s de %(date_field)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "et"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Un(e) %(model_name)s avec ce %(field_label)s existe déjà."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "Un(e) %(model_name)s avec ce %(field_labels)s existe déjà."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr "La valeur « %(value)r » n'est pas un choix valide."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Ce champ ne peut pas être vide."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Ce champ ne peut pas être vide."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Un(e) %(model_name)s avec ce %(field_label)s existe déjà."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s doit être unique pour la partie %(lookup_type)s de "
+"%(date_field_label)s."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Champ de type : %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Entier"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr "La valeur « %(value)s » doit être un nombre entier."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr "La valeur « %(value)s » doit être soit True (vrai), soit False (faux)."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Booléen (soit vrai ou faux)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Chaîne de caractère (jusqu'à %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Des entiers séparés par une virgule"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
"Le format de date de la valeur « %(value)s » n'est pas valide. Le format "
-"correct est AAAA-MM-DD."
+"correct est AAAA-MM-JJ."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-"Le format de date de la valeur « %(value)s » est correct (AAAA-MM-DD), mais "
+"Le format de date de la valeur « %(value)s » est correct (AAAA-MM-JJ), mais "
"la date n'est pas valide."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Date (sans l'heure)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
"Le format de la valeur « %(value)s » n'est pas valide. Le format correct est "
-"AAAA-MM-DD HH:MM[:ss[.uuuuuu]][FH]."
+"AAAA-MM-JJ HH:MM[:ss[.uuuuuu]][FH]."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-"Le format de date de la valeur « %(value)s » est correct (AAAA-MM-DD HH:MM[:"
+"Le format de date de la valeur « %(value)s » est correct (AAAA-MM-JJ HH:MM[:"
"ss[.uuuuuu]][FH]), mais la date ou l'heure n'est pas valide."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Date (avec l'heure)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr "La valeur « %(value)s » doit être un nombre décimal."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Nombre décimal"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Adresse électronique"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Chemin vers le fichier"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr "La valeur « %(value)s » doit être un nombre à virgule flottante."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Nombre à virgule flottante"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Grand entier (8 octets)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Adresse IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Adresse IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
"La valeur « %(value)s » doit valoir soit None (vide), True (vrai) ou False "
"(faux)."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Booléen (soit vrai, faux ou nul)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Nombre entier positif"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Petit nombre entier positif"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (jusqu'à %(max_length)s car.)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Petit nombre entier"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Texte"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
@@ -612,7 +655,7 @@
"Le format de la valeur « %(value)s » n'est pas valide. Le format correct est "
"HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
@@ -621,63 +664,63 @@
"Le format de la valeur « %(value)s » est correct (HH:MM[:ss[.uuuuuu]]), mais "
"l'heure n'est pas valide."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Heure"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Données binaires brutes"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Fichier"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Image"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr "L'instance %(model)s avec la clé primaire %(pk)r n'existe pas."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Clé étrangère (type défini par le champ lié)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Relation un à un"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Relation plusieurs à plusieurs"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Ce champ est obligatoire."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Saisissez un nombre entier."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Saisissez un nombre."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "Assurez-vous qu'il n'y a pas plus de %(max)s chiffre au total."
msgstr[1] "Assurez-vous qu'il n'y a pas plus de %(max)s chiffres au total."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
@@ -686,7 +729,7 @@
msgstr[1] ""
"Assurez-vous qu'il n'y a pas plus de %(max)s chiffres après la virgule."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -697,32 +740,32 @@
msgstr[1] ""
"Assurez-vous qu'il n'y a pas plus de %(max)s chiffres avant la virgule."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Saisissez une date valide."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Saisissez une heure valide."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Saisissez une date et une heure valides."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Aucun fichier n'a été soumis. Vérifiez le type d'encodage du formulaire."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Aucun fichier n'a été soumis."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Le fichier soumis est vide."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -734,11 +777,11 @@
"Assurez-vous que ce nom de fichier comporte au plus %(max)d caractères "
"(actuellement %(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Envoyez un fichier ou cochez la case d'effacement, mais pas les deux."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -746,21 +789,25 @@
"Téléversez une image valide. Le fichier que vous avez transféré n'est pas "
"une image ou bien est corrompu."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Sélectionnez un choix valide. %(value)s n'en fait pas partie."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Saisissez une liste de valeurs."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Saisissez une valeur complète."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr " :"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(champ masqué %(name)s) %(error)s"
@@ -768,44 +815,51 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
"Les données du formulaire ManagementForm sont manquantes ou ont été "
"manipulées"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "Ne soumettez pas plus de %d formulaire."
msgstr[1] "Ne soumettez pas plus de %d formulaires."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Veuillez soumettre au moins %d formulaire."
+msgstr[1] "Veuillez soumettre au moins %d formulaires."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ordre"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Supprimer"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Corrigez les données à double dans %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Corrigez les données à double dans %(field)s qui doit contenir des valeurs "
"uniques."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -814,35 +868,35 @@
"Corrigez les données à double dans %(field_name)s qui doit contenir des "
"valeurs uniques pour la partie %(lookup)s de %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Corrigez les valeurs à double ci-dessous."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clé étrangère en ligne ne correspond pas à la clé primaire de l'instance "
"parente."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Sélectionnez un choix valide. Ce choix ne fait pas partie de ceux "
"disponibles."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "« %(pk)s » n'est pas une valeur correcte pour une clé primaire."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Maintenez appuyé « Ctrl », ou « Commande (touche pomme) » sur un Mac, pour "
"en sélectionner plusieurs."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -851,15 +905,15 @@
"La valeur %(datetime)s n'a pas pu être interprétée dans le fuseau horaire "
"%(current_timezone)s ; elle est peut-être ambigüe ou elle n'existe pas."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Actuellement"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Modifier"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Effacer"
@@ -875,63 +929,63 @@
msgid "No"
msgstr "Non"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "oui, non, peut-être"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d octet"
msgstr[1] "%(size)d octets"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s Kio"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s Mio"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s Gio"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s Tio"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s Pio"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "après-midi"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "matin"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "Après-midi"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "Matin"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "minuit"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "midi"
@@ -1207,117 +1261,150 @@
msgid "December"
msgstr "Décembre"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "Impossible d'importer Pillow ou PIL : %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "Le module « _imaging » de PIL n'a pas pu être importé : %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "Ceci n'est pas une adresse IPv6 valide."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s…"
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "ou"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d année"
msgstr[1] "%d années"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d mois"
msgstr[1] "%d mois"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semaine"
msgstr[1] "%d semaines"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d jour"
msgstr[1] "%d jours"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d heure"
msgstr[1] "%d heures"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minute"
msgstr[1] "%d minutes"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minute"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Il n'est pas autorisé d'afficher le contenu de ce répertoire."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Interdit"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "La vérification CSRF a échoué. La requête a été interrompue."
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "« %(path)s » n'existe pas"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Vous voyez ce message parce que ce site HTTPS exige que le navigateur Web "
+"envoie un en-tête « Referer », ce qu'il n'a pas fait. Cet en-tête est exigé "
+"pour des raisons de sécurité, afin de s'assurer que le navigateur n'ait pas "
+"été piraté par un intervenant externe."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Index de %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Si vous avez désactivé l'envoi des en-têtes « Referer » par votre "
+"navigateur, veuillez les réactiver, au moins pour ce site ou pour les "
+"connexions HTTPS, ou encore pour les requêtes de même origine (« same-"
+"origin »)."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Vous voyez ce message parce que ce site exige la présence d'un cookie CSRF "
+"lors de l'envoi de formulaires. Ce cookie est nécessaire pour des raisons de "
+"sécurité, afin de s'assurer que le navigateur n'ait pas été piraté par un "
+"intervenant externe."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Si vous avez désactivé l'envoi des cookies par votre navigateur, veuillez "
+"les réactiver au moins pour ce site ou pour les requêtes de même origine (« "
+"same-origin »)."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+"Des informations plus détaillées sont affichées lorsque la variable DEBUG "
+"vaut True."
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Aucune année indiquée"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Aucun mois indiqué"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Aucun jour indiqué"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Aucune semaine indiquée"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Pas de %(verbose_name_plural)s disponible"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1326,7 +1413,7 @@
"Pas de %(verbose_name_plural)s disponible dans le futur car %(class_name)s."
"allow_future est faux (False)."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1338,18 +1425,32 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Aucun objet %(verbose_name)s trouvé en réponse à la requête"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Page ne vaut pas « last » et ne peut pas non plus être converti en un nombre "
"entier."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Page non valide (%(page_number)s) : %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Liste vide et %(class_name)s.allow_empty est faux (False)."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Il n'est pas autorisé d'afficher le contenu de ce répertoire."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "« %(path)s » n'existe pas"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Index de %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/fy/formats.py python-django-1.7.4/django/conf/locale/fy/formats.py
--- python-django-1.6.6/django/conf/locale/fy/formats.py 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/fy/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+from __future__ import unicode_literals
+
+# The *_FORMAT strings use the Django date format syntax,
+# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# DATE_FORMAT =
+# TIME_FORMAT =
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
+# MONTH_DAY_FORMAT =
+# SHORT_DATE_FORMAT =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+
+# The *_INPUT_FORMATS strings use the Python strftime format syntax,
+# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+# DECIMAL_SEPARATOR =
+# THOUSAND_SEPARATOR =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/fy/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/fy/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/fy/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/fy/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/fy/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/fy/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -0,0 +1,1382 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Jannis Leidel , 2011
+msgid ""
+msgstr ""
+"Project-Id-Version: django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:51+0000\n"
+"Last-Translator: Jannis Leidel \n"
+"Language-Team: Western Frisian (http://www.transifex.com/projects/p/django/"
+"language/fy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: conf/global_settings.py:51
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:52
+msgid "Arabic"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Azerbaijani"
+msgstr ""
+
+#: conf/global_settings.py:54
+msgid "Bulgarian"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:56
+msgid "Bengali"
+msgstr ""
+
+#: conf/global_settings.py:57
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:58
+msgid "Bosnian"
+msgstr ""
+
+#: conf/global_settings.py:59
+msgid "Catalan"
+msgstr ""
+
+#: conf/global_settings.py:60
+msgid "Czech"
+msgstr ""
+
+#: conf/global_settings.py:61
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:62
+msgid "Danish"
+msgstr ""
+
+#: conf/global_settings.py:63
+msgid "German"
+msgstr ""
+
+#: conf/global_settings.py:64
+msgid "Greek"
+msgstr ""
+
+#: conf/global_settings.py:65
+msgid "English"
+msgstr ""
+
+#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
+msgid "British English"
+msgstr ""
+
+#: conf/global_settings.py:68
+msgid "Esperanto"
+msgstr ""
+
+#: conf/global_settings.py:69
+msgid "Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
+msgid "Argentinian Spanish"
+msgstr ""
+
+#: conf/global_settings.py:71
+msgid "Mexican Spanish"
+msgstr ""
+
+#: conf/global_settings.py:72
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:73
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:74
+msgid "Estonian"
+msgstr ""
+
+#: conf/global_settings.py:75
+msgid "Basque"
+msgstr ""
+
+#: conf/global_settings.py:76
+msgid "Persian"
+msgstr ""
+
+#: conf/global_settings.py:77
+msgid "Finnish"
+msgstr ""
+
+#: conf/global_settings.py:78
+msgid "French"
+msgstr ""
+
+#: conf/global_settings.py:79
+msgid "Frisian"
+msgstr ""
+
+#: conf/global_settings.py:80
+msgid "Irish"
+msgstr ""
+
+#: conf/global_settings.py:81
+msgid "Galician"
+msgstr ""
+
+#: conf/global_settings.py:82
+msgid "Hebrew"
+msgstr ""
+
+#: conf/global_settings.py:83
+msgid "Hindi"
+msgstr ""
+
+#: conf/global_settings.py:84
+msgid "Croatian"
+msgstr ""
+
+#: conf/global_settings.py:85
+msgid "Hungarian"
+msgstr ""
+
+#: conf/global_settings.py:86
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:87
+msgid "Indonesian"
+msgstr ""
+
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:89
+msgid "Italian"
+msgstr ""
+
+#: conf/global_settings.py:90
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:91
+msgid "Georgian"
+msgstr ""
+
+#: conf/global_settings.py:92
+msgid "Kazakh"
+msgstr ""
+
+#: conf/global_settings.py:93
+msgid "Khmer"
+msgstr ""
+
+#: conf/global_settings.py:94
+msgid "Kannada"
+msgstr ""
+
+#: conf/global_settings.py:95
+msgid "Korean"
+msgstr ""
+
+#: conf/global_settings.py:96
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:97
+msgid "Lithuanian"
+msgstr ""
+
+#: conf/global_settings.py:98
+msgid "Latvian"
+msgstr ""
+
+#: conf/global_settings.py:99
+msgid "Macedonian"
+msgstr ""
+
+#: conf/global_settings.py:100
+msgid "Malayalam"
+msgstr ""
+
+#: conf/global_settings.py:101
+msgid "Mongolian"
+msgstr ""
+
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: conf/global_settings.py:104
+msgid "Nepali"
+msgstr ""
+
+#: conf/global_settings.py:105
+msgid "Dutch"
+msgstr ""
+
+#: conf/global_settings.py:106
+msgid "Norwegian Nynorsk"
+msgstr ""
+
+#: conf/global_settings.py:107
+msgid "Ossetic"
+msgstr ""
+
+#: conf/global_settings.py:108
+msgid "Punjabi"
+msgstr ""
+
+#: conf/global_settings.py:109
+msgid "Polish"
+msgstr ""
+
+#: conf/global_settings.py:110
+msgid "Portuguese"
+msgstr ""
+
+#: conf/global_settings.py:111
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: conf/global_settings.py:112
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:113
+msgid "Russian"
+msgstr ""
+
+#: conf/global_settings.py:114
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:115
+msgid "Slovenian"
+msgstr ""
+
+#: conf/global_settings.py:116
+msgid "Albanian"
+msgstr ""
+
+#: conf/global_settings.py:117
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:118
+msgid "Serbian Latin"
+msgstr ""
+
+#: conf/global_settings.py:119
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:120
+msgid "Swahili"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Tamil"
+msgstr ""
+
+#: conf/global_settings.py:122
+msgid "Telugu"
+msgstr ""
+
+#: conf/global_settings.py:123
+msgid "Thai"
+msgstr ""
+
+#: conf/global_settings.py:124
+msgid "Turkish"
+msgstr ""
+
+#: conf/global_settings.py:125
+msgid "Tatar"
+msgstr ""
+
+#: conf/global_settings.py:126
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:127
+msgid "Ukrainian"
+msgstr ""
+
+#: conf/global_settings.py:128
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:129
+msgid "Vietnamese"
+msgstr ""
+
+#: conf/global_settings.py:130 conf/global_settings.py:131
+msgid "Simplified Chinese"
+msgstr ""
+
+#: conf/global_settings.py:132 conf/global_settings.py:133
+msgid "Traditional Chinese"
+msgstr ""
+
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
+#: core/validators.py:21
+msgid "Enter a valid value."
+msgstr "Jou in falide wearde."
+
+#: core/validators.py:77 forms/fields.py:675
+msgid "Enter a valid URL."
+msgstr "Jou in falide URL."
+
+#: core/validators.py:115
+msgid "Enter a valid integer."
+msgstr ""
+
+#: core/validators.py:120
+msgid "Enter a valid email address."
+msgstr ""
+
+#: core/validators.py:185
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Jou in falida 'slug' gearsteld mei letters, nûmers, ûnderstreekjes of "
+"koppelteken."
+
+#: core/validators.py:188 core/validators.py:207
+msgid "Enter a valid IPv4 address."
+msgstr "Jou in falide IPv4-adres."
+
+#: core/validators.py:193 core/validators.py:208
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:203 core/validators.py:206
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:229 db/models/fields/__init__.py:1070
+msgid "Enter only digits separated by commas."
+msgstr "Jou allinnich sifers, skieden troch komma's."
+
+#: core/validators.py:236
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+
+#: core/validators.py:255
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr ""
+
+#: core/validators.py:262
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr ""
+
+#: core/validators.py:271
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:282
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: db/models/base.py:975 forms/models.py:718
+msgid "and"
+msgstr ""
+
+#: db/models/base.py:977
+#, python-format
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
+
+#: db/models/fields/__init__.py:104
+#, python-format
+msgid "Value %(value)r is not a valid choice."
+msgstr ""
+
+#: db/models/fields/__init__.py:105
+msgid "This field cannot be null."
+msgstr "Dit fjild kin net leech wêze."
+
+#: db/models/fields/__init__.py:106
+msgid "This field cannot be blank."
+msgstr ""
+
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s mei dit %(field_label)s bestiet al."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
+msgid "Integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: db/models/fields/__init__.py:926
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:928
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1004
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1065
+msgid "Comma-separated integers"
+msgstr ""
+
+#: db/models/fields/__init__.py:1080
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: db/models/fields/__init__.py:1085
+msgid "Date (without time)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1187
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1191
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1195
+msgid "Date (with time)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1297
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: db/models/fields/__init__.py:1299
+msgid "Decimal number"
+msgstr ""
+
+#: db/models/fields/__init__.py:1444
+msgid "Email address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1470
+msgid "File path"
+msgstr ""
+
+#: db/models/fields/__init__.py:1537
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: db/models/fields/__init__.py:1539
+msgid "Floating point number"
+msgstr ""
+
+#: db/models/fields/__init__.py:1623
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1638
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1668
+msgid "IP address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1747
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:1749
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1809
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1821
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1834
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1863
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1870
+msgid "Text"
+msgstr ""
+
+#: db/models/fields/__init__.py:1893
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1895
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1898
+msgid "Time"
+msgstr ""
+
+#: db/models/fields/__init__.py:1977
+msgid "URL"
+msgstr ""
+
+#: db/models/fields/__init__.py:2000
+msgid "Raw binary data"
+msgstr ""
+
+#: db/models/fields/files.py:225
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:375
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:1580
+#, python-format
+msgid "%(model)s instance with pk %(pk)r does not exist."
+msgstr ""
+
+#: db/models/fields/related.py:1582
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+
+#: db/models/fields/related.py:1773
+msgid "One-to-one relationship"
+msgstr ""
+
+#: db/models/fields/related.py:1843
+msgid "Many-to-many relationship"
+msgstr ""
+
+#: forms/fields.py:55
+msgid "This field is required."
+msgstr "Dit fjild is fereaske."
+
+#: forms/fields.py:236
+msgid "Enter a whole number."
+msgstr "Jou in folslein nûmer."
+
+#: forms/fields.py:279 forms/fields.py:316
+msgid "Enter a number."
+msgstr "Jou in nûmer."
+
+#: forms/fields.py:318
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/fields.py:322
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/fields.py:326
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/fields.py:437 forms/fields.py:1139
+msgid "Enter a valid date."
+msgstr "Jou in falide datum."
+
+#: forms/fields.py:461 forms/fields.py:1140
+msgid "Enter a valid time."
+msgstr "Jou in falide tiid."
+
+#: forms/fields.py:483
+msgid "Enter a valid date/time."
+msgstr "Jou in falide datum.tiid."
+
+#: forms/fields.py:564
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+"Der is gjin bestân yntsjinne. Kontrolearje it kodearringstype op it "
+"formulier."
+
+#: forms/fields.py:565
+msgid "No file was submitted."
+msgstr "Der is gjin bestân yntsjinne."
+
+#: forms/fields.py:566
+msgid "The submitted file is empty."
+msgstr "It yntsjinne bestân is leech."
+
+#: forms/fields.py:568
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/fields.py:571
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+
+#: forms/fields.py:632
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Laad in falide ôfbylding op. It bestân dy't jo opladen hawwe wie net in "
+"ôfbylding of in skansearre ôfbylding."
+
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+"Selektearje in falide kar. %(value)s is net ien fan de beskikbere karren."
+
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
+msgid "Enter a list of values."
+msgstr "Jou in list mei weardes."
+
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
+#. Translators: This is the default suffix added to form field labels
+#: forms/forms.py:122
+msgid ":"
+msgstr ""
+
+#: forms/forms.py:192
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr ""
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the
+#. label
+#: forms/forms.py:620
+msgid ":?.!"
+msgstr ""
+
+#: forms/formsets.py:95
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: forms/formsets.py:332
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
+msgid "Order"
+msgstr "Oarder"
+
+#: forms/formsets.py:371
+msgid "Delete"
+msgstr ""
+
+#: forms/models.py:712
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: forms/models.py:716
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: forms/models.py:722
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+
+#: forms/models.py:730
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: forms/models.py:1028
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+
+#: forms/models.py:1094
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Selektearje in falide kar. Dizze kar is net ien fan de beskikbere karren."
+
+#: forms/models.py:1194
+#, python-format
+msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgstr ""
+
+#: forms/models.py:1205
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Hâld \"Control\", of \"Command\" op in Mac del, om mear as ien te "
+"selektearjen."
+
+#: forms/utils.py:148
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:350
+msgid "Currently"
+msgstr ""
+
+#: forms/widgets.py:351
+msgid "Change"
+msgstr ""
+
+#: forms/widgets.py:352
+msgid "Clear"
+msgstr ""
+
+#: forms/widgets.py:546
+msgid "Unknown"
+msgstr ""
+
+#: forms/widgets.py:547
+msgid "Yes"
+msgstr ""
+
+#: forms/widgets.py:548
+msgid "No"
+msgstr ""
+
+#: template/defaultfilters.py:855
+msgid "yes,no,maybe"
+msgstr ""
+
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/defaultfilters.py:898
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#: template/defaultfilters.py:900
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#: template/defaultfilters.py:902
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#: template/defaultfilters.py:904
+#, python-format
+msgid "%s TB"
+msgstr ""
+
+#: template/defaultfilters.py:906
+#, python-format
+msgid "%s PB"
+msgstr ""
+
+#: utils/dateformat.py:59
+msgid "p.m."
+msgstr ""
+
+#: utils/dateformat.py:60
+msgid "a.m."
+msgstr ""
+
+#: utils/dateformat.py:65
+msgid "PM"
+msgstr ""
+
+#: utils/dateformat.py:66
+msgid "AM"
+msgstr ""
+
+#: utils/dateformat.py:149
+msgid "midnight"
+msgstr ""
+
+#: utils/dateformat.py:151
+msgid "noon"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr ""
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr ""
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr ""
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr ""
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "January"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "February"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "March"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "April"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "August"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "September"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "October"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "November"
+msgstr ""
+
+#: utils/dates.py:20
+msgid "December"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "may"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr ""
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr ""
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr ""
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr ""
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr ""
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr ""
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr ""
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr ""
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr ""
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr ""
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr ""
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr ""
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr ""
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr ""
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr ""
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr ""
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr ""
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr ""
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr ""
+
+#: utils/ipv6.py:10
+msgid "This is not a valid IPv6 address."
+msgstr ""
+
+#: utils/text.py:76
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:245
+msgid "or"
+msgstr ""
+
+#. Translators: This string is used as a separator between list elements
+#: utils/text.py:264 utils/timesince.py:57
+msgid ", "
+msgstr ""
+
+#: utils/timesince.py:25
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:26
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:27
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:28
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:29
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:30
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:46
+msgid "0 minutes"
+msgstr ""
+
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
+
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:158
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:214
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:369 views/generic/dates.py:397
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: views/generic/dates.py:650
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:682
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: views/generic/list.py:62
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:67
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: views/generic/list.py:158
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
diff -Nru python-django-1.6.6/django/conf/locale/fy_NL/formats.py python-django-1.7.4/django/conf/locale/fy_NL/formats.py
--- python-django-1.6.6/django/conf/locale/fy_NL/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/fy_NL/formats.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-# This file is distributed under the same license as the Django package.
-#
-from __future__ import unicode_literals
-
-# The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-# DATE_FORMAT =
-# TIME_FORMAT =
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
-# MONTH_DAY_FORMAT =
-# SHORT_DATE_FORMAT =
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
-
-# The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
-# DECIMAL_SEPARATOR =
-# THOUSAND_SEPARATOR =
-# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/fy_NL/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/fy_NL/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/fy_NL/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/fy_NL/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/fy_NL/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/fy_NL/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000
@@ -1,1301 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel , 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: django-core\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
-"Last-Translator: Jannis Leidel \n"
-"Language-Team: Western Frisian (Netherlands) (http://www.transifex.com/"
-"projects/p/django/language/fy_NL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fy_NL\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: conf/global_settings.py:51
-msgid "Afrikaans"
-msgstr ""
-
-#: conf/global_settings.py:52
-msgid "Arabic"
-msgstr ""
-
-#: conf/global_settings.py:53
-msgid "Azerbaijani"
-msgstr ""
-
-#: conf/global_settings.py:54
-msgid "Bulgarian"
-msgstr ""
-
-#: conf/global_settings.py:55
-msgid "Belarusian"
-msgstr ""
-
-#: conf/global_settings.py:56
-msgid "Bengali"
-msgstr ""
-
-#: conf/global_settings.py:57
-msgid "Breton"
-msgstr ""
-
-#: conf/global_settings.py:58
-msgid "Bosnian"
-msgstr ""
-
-#: conf/global_settings.py:59
-msgid "Catalan"
-msgstr ""
-
-#: conf/global_settings.py:60
-msgid "Czech"
-msgstr ""
-
-#: conf/global_settings.py:61
-msgid "Welsh"
-msgstr ""
-
-#: conf/global_settings.py:62
-msgid "Danish"
-msgstr ""
-
-#: conf/global_settings.py:63
-msgid "German"
-msgstr ""
-
-#: conf/global_settings.py:64
-msgid "Greek"
-msgstr ""
-
-#: conf/global_settings.py:65
-msgid "English"
-msgstr ""
-
-#: conf/global_settings.py:66
-msgid "British English"
-msgstr ""
-
-#: conf/global_settings.py:67
-msgid "Esperanto"
-msgstr ""
-
-#: conf/global_settings.py:68
-msgid "Spanish"
-msgstr ""
-
-#: conf/global_settings.py:69
-msgid "Argentinian Spanish"
-msgstr ""
-
-#: conf/global_settings.py:70
-msgid "Mexican Spanish"
-msgstr ""
-
-#: conf/global_settings.py:71
-msgid "Nicaraguan Spanish"
-msgstr ""
-
-#: conf/global_settings.py:72
-msgid "Venezuelan Spanish"
-msgstr ""
-
-#: conf/global_settings.py:73
-msgid "Estonian"
-msgstr ""
-
-#: conf/global_settings.py:74
-msgid "Basque"
-msgstr ""
-
-#: conf/global_settings.py:75
-msgid "Persian"
-msgstr ""
-
-#: conf/global_settings.py:76
-msgid "Finnish"
-msgstr ""
-
-#: conf/global_settings.py:77
-msgid "French"
-msgstr ""
-
-#: conf/global_settings.py:78
-msgid "Frisian"
-msgstr ""
-
-#: conf/global_settings.py:79
-msgid "Irish"
-msgstr ""
-
-#: conf/global_settings.py:80
-msgid "Galician"
-msgstr ""
-
-#: conf/global_settings.py:81
-msgid "Hebrew"
-msgstr ""
-
-#: conf/global_settings.py:82
-msgid "Hindi"
-msgstr ""
-
-#: conf/global_settings.py:83
-msgid "Croatian"
-msgstr ""
-
-#: conf/global_settings.py:84
-msgid "Hungarian"
-msgstr ""
-
-#: conf/global_settings.py:85
-msgid "Interlingua"
-msgstr ""
-
-#: conf/global_settings.py:86
-msgid "Indonesian"
-msgstr ""
-
-#: conf/global_settings.py:87
-msgid "Icelandic"
-msgstr ""
-
-#: conf/global_settings.py:88
-msgid "Italian"
-msgstr ""
-
-#: conf/global_settings.py:89
-msgid "Japanese"
-msgstr ""
-
-#: conf/global_settings.py:90
-msgid "Georgian"
-msgstr ""
-
-#: conf/global_settings.py:91
-msgid "Kazakh"
-msgstr ""
-
-#: conf/global_settings.py:92
-msgid "Khmer"
-msgstr ""
-
-#: conf/global_settings.py:93
-msgid "Kannada"
-msgstr ""
-
-#: conf/global_settings.py:94
-msgid "Korean"
-msgstr ""
-
-#: conf/global_settings.py:95
-msgid "Luxembourgish"
-msgstr ""
-
-#: conf/global_settings.py:96
-msgid "Lithuanian"
-msgstr ""
-
-#: conf/global_settings.py:97
-msgid "Latvian"
-msgstr ""
-
-#: conf/global_settings.py:98
-msgid "Macedonian"
-msgstr ""
-
-#: conf/global_settings.py:99
-msgid "Malayalam"
-msgstr ""
-
-#: conf/global_settings.py:100
-msgid "Mongolian"
-msgstr ""
-
-#: conf/global_settings.py:101
-msgid "Burmese"
-msgstr ""
-
-#: conf/global_settings.py:102
-msgid "Norwegian Bokmal"
-msgstr ""
-
-#: conf/global_settings.py:103
-msgid "Nepali"
-msgstr ""
-
-#: conf/global_settings.py:104
-msgid "Dutch"
-msgstr ""
-
-#: conf/global_settings.py:105
-msgid "Norwegian Nynorsk"
-msgstr ""
-
-#: conf/global_settings.py:106
-msgid "Ossetic"
-msgstr ""
-
-#: conf/global_settings.py:107
-msgid "Punjabi"
-msgstr ""
-
-#: conf/global_settings.py:108
-msgid "Polish"
-msgstr ""
-
-#: conf/global_settings.py:109
-msgid "Portuguese"
-msgstr ""
-
-#: conf/global_settings.py:110
-msgid "Brazilian Portuguese"
-msgstr ""
-
-#: conf/global_settings.py:111
-msgid "Romanian"
-msgstr ""
-
-#: conf/global_settings.py:112
-msgid "Russian"
-msgstr ""
-
-#: conf/global_settings.py:113
-msgid "Slovak"
-msgstr ""
-
-#: conf/global_settings.py:114
-msgid "Slovenian"
-msgstr ""
-
-#: conf/global_settings.py:115
-msgid "Albanian"
-msgstr ""
-
-#: conf/global_settings.py:116
-msgid "Serbian"
-msgstr ""
-
-#: conf/global_settings.py:117
-msgid "Serbian Latin"
-msgstr ""
-
-#: conf/global_settings.py:118
-msgid "Swedish"
-msgstr ""
-
-#: conf/global_settings.py:119
-msgid "Swahili"
-msgstr ""
-
-#: conf/global_settings.py:120
-msgid "Tamil"
-msgstr ""
-
-#: conf/global_settings.py:121
-msgid "Telugu"
-msgstr ""
-
-#: conf/global_settings.py:122
-msgid "Thai"
-msgstr ""
-
-#: conf/global_settings.py:123
-msgid "Turkish"
-msgstr ""
-
-#: conf/global_settings.py:124
-msgid "Tatar"
-msgstr ""
-
-#: conf/global_settings.py:125
-msgid "Udmurt"
-msgstr ""
-
-#: conf/global_settings.py:126
-msgid "Ukrainian"
-msgstr ""
-
-#: conf/global_settings.py:127
-msgid "Urdu"
-msgstr ""
-
-#: conf/global_settings.py:128
-msgid "Vietnamese"
-msgstr ""
-
-#: conf/global_settings.py:129
-msgid "Simplified Chinese"
-msgstr ""
-
-#: conf/global_settings.py:130
-msgid "Traditional Chinese"
-msgstr ""
-
-#: core/validators.py:21
-msgid "Enter a valid value."
-msgstr "Jou in falide wearde."
-
-#: core/validators.py:53 forms/fields.py:650
-msgid "Enter a valid URL."
-msgstr "Jou in falide URL."
-
-#: core/validators.py:79
-msgid "Enter a valid integer."
-msgstr ""
-
-#: core/validators.py:83
-msgid "Enter a valid email address."
-msgstr ""
-
-#: core/validators.py:131
-msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr ""
-"Jou in falida 'slug' gearsteld mei letters, nûmers, ûnderstreekjes of "
-"koppelteken."
-
-#: core/validators.py:134 core/validators.py:153
-msgid "Enter a valid IPv4 address."
-msgstr "Jou in falide IPv4-adres."
-
-#: core/validators.py:139 core/validators.py:154
-msgid "Enter a valid IPv6 address."
-msgstr ""
-
-#: core/validators.py:149 core/validators.py:152
-msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
-
-#: core/validators.py:175 db/models/fields/__init__.py:712
-msgid "Enter only digits separated by commas."
-msgstr "Jou allinnich sifers, skieden troch komma's."
-
-#: core/validators.py:181
-#, python-format
-msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr ""
-
-#: core/validators.py:196
-#, python-format
-msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
-
-#: core/validators.py:202
-#, python-format
-msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
-
-#: core/validators.py:210
-#, python-format
-msgid ""
-"Ensure this value has at least %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at least %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: core/validators.py:220
-#, python-format
-msgid ""
-"Ensure this value has at most %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at most %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-
-#: db/models/base.py:907 forms/models.py:686
-msgid "and"
-msgstr ""
-
-#: db/models/base.py:908 db/models/fields/__init__.py:83
-#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s mei dit %(field_label)s bestiet al."
-
-#: db/models/fields/__init__.py:80
-#, python-format
-msgid "Value %(value)r is not a valid choice."
-msgstr ""
-
-#: db/models/fields/__init__.py:81
-msgid "This field cannot be null."
-msgstr "Dit fjild kin net leech wêze."
-
-#: db/models/fields/__init__.py:82
-msgid "This field cannot be blank."
-msgstr ""
-
-#: db/models/fields/__init__.py:89
-#, python-format
-msgid "Field of type: %(field_type)s"
-msgstr ""
-
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
-msgid "Integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
-#, python-format
-msgid "'%(value)s' value must be an integer."
-msgstr ""
-
-#: db/models/fields/__init__.py:625
-#, python-format
-msgid "'%(value)s' value must be either True or False."
-msgstr ""
-
-#: db/models/fields/__init__.py:627
-msgid "Boolean (Either True or False)"
-msgstr ""
-
-#: db/models/fields/__init__.py:679
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr ""
-
-#: db/models/fields/__init__.py:707
-msgid "Comma-separated integers"
-msgstr ""
-
-#: db/models/fields/__init__.py:721
-#, python-format
-msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
-"format."
-msgstr ""
-
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
-#, python-format
-msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
-"date."
-msgstr ""
-
-#: db/models/fields/__init__.py:726
-msgid "Date (without time)"
-msgstr ""
-
-#: db/models/fields/__init__.py:815
-#, python-format
-msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
-"uuuuuu]][TZ] format."
-msgstr ""
-
-#: db/models/fields/__init__.py:819
-#, python-format
-msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
-"[TZ]) but it is an invalid date/time."
-msgstr ""
-
-#: db/models/fields/__init__.py:823
-msgid "Date (with time)"
-msgstr ""
-
-#: db/models/fields/__init__.py:921
-#, python-format
-msgid "'%(value)s' value must be a decimal number."
-msgstr ""
-
-#: db/models/fields/__init__.py:923
-msgid "Decimal number"
-msgstr ""
-
-#: db/models/fields/__init__.py:983
-msgid "Email address"
-msgstr ""
-
-#: db/models/fields/__init__.py:1002
-msgid "File path"
-msgstr ""
-
-#: db/models/fields/__init__.py:1029
-#, python-format
-msgid "'%(value)s' value must be a float."
-msgstr ""
-
-#: db/models/fields/__init__.py:1031
-msgid "Floating point number"
-msgstr ""
-
-#: db/models/fields/__init__.py:1098
-msgid "Big (8 byte) integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:1112
-msgid "IPv4 address"
-msgstr ""
-
-#: db/models/fields/__init__.py:1128
-msgid "IP address"
-msgstr ""
-
-#: db/models/fields/__init__.py:1175
-#, python-format
-msgid "'%(value)s' value must be either None, True or False."
-msgstr ""
-
-#: db/models/fields/__init__.py:1177
-msgid "Boolean (Either True, False or None)"
-msgstr ""
-
-#: db/models/fields/__init__.py:1229
-msgid "Positive integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:1240
-msgid "Positive small integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:1252
-#, python-format
-msgid "Slug (up to %(max_length)s)"
-msgstr ""
-
-#: db/models/fields/__init__.py:1270
-msgid "Small integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:1276
-msgid "Text"
-msgstr ""
-
-#: db/models/fields/__init__.py:1294
-#, python-format
-msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
-"format."
-msgstr ""
-
-#: db/models/fields/__init__.py:1296
-#, python-format
-msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
-"invalid time."
-msgstr ""
-
-#: db/models/fields/__init__.py:1299
-msgid "Time"
-msgstr ""
-
-#: db/models/fields/__init__.py:1368
-msgid "URL"
-msgstr ""
-
-#: db/models/fields/__init__.py:1384
-msgid "Raw binary data"
-msgstr ""
-
-#: db/models/fields/files.py:217
-msgid "File"
-msgstr ""
-
-#: db/models/fields/files.py:324
-msgid "Image"
-msgstr ""
-
-#: db/models/fields/related.py:1128
-#, python-format
-msgid "%(model)s instance with pk %(pk)r does not exist."
-msgstr ""
-
-#: db/models/fields/related.py:1130
-msgid "Foreign Key (type determined by related field)"
-msgstr ""
-
-#: db/models/fields/related.py:1271
-msgid "One-to-one relationship"
-msgstr ""
-
-#: db/models/fields/related.py:1338
-msgid "Many-to-many relationship"
-msgstr ""
-
-#: forms/fields.py:56
-msgid "This field is required."
-msgstr "Dit fjild is fereaske."
-
-#: forms/fields.py:225
-msgid "Enter a whole number."
-msgstr "Jou in folslein nûmer."
-
-#: forms/fields.py:266 forms/fields.py:294
-msgid "Enter a number."
-msgstr "Jou in nûmer."
-
-#: forms/fields.py:296
-#, python-format
-msgid "Ensure that there are no more than %(max)s digit in total."
-msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-msgstr[1] ""
-
-#: forms/fields.py:300
-#, python-format
-msgid "Ensure that there are no more than %(max)s decimal place."
-msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-msgstr[1] ""
-
-#: forms/fields.py:304
-#, python-format
-msgid ""
-"Ensure that there are no more than %(max)s digit before the decimal point."
-msgid_plural ""
-"Ensure that there are no more than %(max)s digits before the decimal point."
-msgstr[0] ""
-msgstr[1] ""
-
-#: forms/fields.py:415 forms/fields.py:1088
-msgid "Enter a valid date."
-msgstr "Jou in falide datum."
-
-#: forms/fields.py:439 forms/fields.py:1089
-msgid "Enter a valid time."
-msgstr "Jou in falide tiid."
-
-#: forms/fields.py:461
-msgid "Enter a valid date/time."
-msgstr "Jou in falide datum.tiid."
-
-#: forms/fields.py:539
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-"Der is gjin bestân yntsjinne. Kontrolearje it kodearringstype op it "
-"formulier."
-
-#: forms/fields.py:540
-msgid "No file was submitted."
-msgstr "Der is gjin bestân yntsjinne."
-
-#: forms/fields.py:541
-msgid "The submitted file is empty."
-msgstr "It yntsjinne bestân is leech."
-
-#: forms/fields.py:543
-#, python-format
-msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
-msgid_plural ""
-"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: forms/fields.py:546
-msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
-
-#: forms/fields.py:607
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-"Laad in falide ôfbylding op. It bestân dy't jo opladen hawwe wie net in "
-"ôfbylding of in skansearre ôfbylding."
-
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
-"Selektearje in falide kar. %(value)s is net ien fan de beskikbere karren."
-
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
-msgid "Enter a list of values."
-msgstr "Jou in list mei weardes."
-
-#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
-msgid ":"
-msgstr ""
-
-#: forms/forms.py:159
-#, python-format
-msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
-
-#. Translators: If found as last label character, these punctuation
-#. characters will prevent the default label_suffix to be appended to the
-#. label
-#: forms/forms.py:527
-msgid ":?.!"
-msgstr ""
-
-#: forms/formsets.py:88
-msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
-
-#: forms/formsets.py:321
-#, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-msgstr[1] ""
-
-#: forms/formsets.py:350 forms/formsets.py:352
-msgid "Order"
-msgstr "Oarder"
-
-#: forms/formsets.py:354
-msgid "Delete"
-msgstr ""
-
-#: forms/models.py:680
-#, python-format
-msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
-
-#: forms/models.py:684
-#, python-format
-msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
-
-#: forms/models.py:690
-#, python-format
-msgid ""
-"Please correct the duplicate data for %(field_name)s which must be unique "
-"for the %(lookup)s in %(date_field)s."
-msgstr ""
-
-#: forms/models.py:698
-msgid "Please correct the duplicate values below."
-msgstr ""
-
-#: forms/models.py:986
-msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
-
-#: forms/models.py:1050
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-"Selektearje in falide kar. Dizze kar is net ien fan de beskikbere karren."
-
-#: forms/models.py:1147
-#, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
-msgstr ""
-
-#: forms/models.py:1158
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
-"Hâld \"Control\", of \"Command\" op in Mac del, om mear as ien te "
-"selektearjen."
-
-#: forms/util.py:83
-#, python-format
-msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
-"may be ambiguous or it may not exist."
-msgstr ""
-
-#: forms/widgets.py:326
-msgid "Currently"
-msgstr ""
-
-#: forms/widgets.py:327
-msgid "Change"
-msgstr ""
-
-#: forms/widgets.py:328
-msgid "Clear"
-msgstr ""
-
-#: forms/widgets.py:546
-msgid "Unknown"
-msgstr ""
-
-#: forms/widgets.py:547
-msgid "Yes"
-msgstr ""
-
-#: forms/widgets.py:548
-msgid "No"
-msgstr ""
-
-#: template/defaultfilters.py:784
-msgid "yes,no,maybe"
-msgstr ""
-
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
-#, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: template/defaultfilters.py:826
-#, python-format
-msgid "%s KB"
-msgstr ""
-
-#: template/defaultfilters.py:828
-#, python-format
-msgid "%s MB"
-msgstr ""
-
-#: template/defaultfilters.py:830
-#, python-format
-msgid "%s GB"
-msgstr ""
-
-#: template/defaultfilters.py:832
-#, python-format
-msgid "%s TB"
-msgstr ""
-
-#: template/defaultfilters.py:834
-#, python-format
-msgid "%s PB"
-msgstr ""
-
-#: utils/dateformat.py:47
-msgid "p.m."
-msgstr ""
-
-#: utils/dateformat.py:48
-msgid "a.m."
-msgstr ""
-
-#: utils/dateformat.py:53
-msgid "PM"
-msgstr ""
-
-#: utils/dateformat.py:54
-msgid "AM"
-msgstr ""
-
-#: utils/dateformat.py:103
-msgid "midnight"
-msgstr ""
-
-#: utils/dateformat.py:105
-msgid "noon"
-msgstr ""
-
-#: utils/dates.py:6
-msgid "Monday"
-msgstr ""
-
-#: utils/dates.py:6
-msgid "Tuesday"
-msgstr ""
-
-#: utils/dates.py:6
-msgid "Wednesday"
-msgstr ""
-
-#: utils/dates.py:6
-msgid "Thursday"
-msgstr ""
-
-#: utils/dates.py:6
-msgid "Friday"
-msgstr ""
-
-#: utils/dates.py:7
-msgid "Saturday"
-msgstr ""
-
-#: utils/dates.py:7
-msgid "Sunday"
-msgstr ""
-
-#: utils/dates.py:10
-msgid "Mon"
-msgstr ""
-
-#: utils/dates.py:10
-msgid "Tue"
-msgstr ""
-
-#: utils/dates.py:10
-msgid "Wed"
-msgstr ""
-
-#: utils/dates.py:10
-msgid "Thu"
-msgstr ""
-
-#: utils/dates.py:10
-msgid "Fri"
-msgstr ""
-
-#: utils/dates.py:11
-msgid "Sat"
-msgstr ""
-
-#: utils/dates.py:11
-msgid "Sun"
-msgstr ""
-
-#: utils/dates.py:18
-msgid "January"
-msgstr ""
-
-#: utils/dates.py:18
-msgid "February"
-msgstr ""
-
-#: utils/dates.py:18
-msgid "March"
-msgstr ""
-
-#: utils/dates.py:18
-msgid "April"
-msgstr ""
-
-#: utils/dates.py:18
-msgid "May"
-msgstr ""
-
-#: utils/dates.py:18
-msgid "June"
-msgstr ""
-
-#: utils/dates.py:19
-msgid "July"
-msgstr ""
-
-#: utils/dates.py:19
-msgid "August"
-msgstr ""
-
-#: utils/dates.py:19
-msgid "September"
-msgstr ""
-
-#: utils/dates.py:19
-msgid "October"
-msgstr ""
-
-#: utils/dates.py:19
-msgid "November"
-msgstr ""
-
-#: utils/dates.py:20
-msgid "December"
-msgstr ""
-
-#: utils/dates.py:23
-msgid "jan"
-msgstr ""
-
-#: utils/dates.py:23
-msgid "feb"
-msgstr ""
-
-#: utils/dates.py:23
-msgid "mar"
-msgstr ""
-
-#: utils/dates.py:23
-msgid "apr"
-msgstr ""
-
-#: utils/dates.py:23
-msgid "may"
-msgstr ""
-
-#: utils/dates.py:23
-msgid "jun"
-msgstr ""
-
-#: utils/dates.py:24
-msgid "jul"
-msgstr ""
-
-#: utils/dates.py:24
-msgid "aug"
-msgstr ""
-
-#: utils/dates.py:24
-msgid "sep"
-msgstr ""
-
-#: utils/dates.py:24
-msgid "oct"
-msgstr ""
-
-#: utils/dates.py:24
-msgid "nov"
-msgstr ""
-
-#: utils/dates.py:24
-msgid "dec"
-msgstr ""
-
-#: utils/dates.py:31
-msgctxt "abbrev. month"
-msgid "Jan."
-msgstr ""
-
-#: utils/dates.py:32
-msgctxt "abbrev. month"
-msgid "Feb."
-msgstr ""
-
-#: utils/dates.py:33
-msgctxt "abbrev. month"
-msgid "March"
-msgstr ""
-
-#: utils/dates.py:34
-msgctxt "abbrev. month"
-msgid "April"
-msgstr ""
-
-#: utils/dates.py:35
-msgctxt "abbrev. month"
-msgid "May"
-msgstr ""
-
-#: utils/dates.py:36
-msgctxt "abbrev. month"
-msgid "June"
-msgstr ""
-
-#: utils/dates.py:37
-msgctxt "abbrev. month"
-msgid "July"
-msgstr ""
-
-#: utils/dates.py:38
-msgctxt "abbrev. month"
-msgid "Aug."
-msgstr ""
-
-#: utils/dates.py:39
-msgctxt "abbrev. month"
-msgid "Sept."
-msgstr ""
-
-#: utils/dates.py:40
-msgctxt "abbrev. month"
-msgid "Oct."
-msgstr ""
-
-#: utils/dates.py:41
-msgctxt "abbrev. month"
-msgid "Nov."
-msgstr ""
-
-#: utils/dates.py:42
-msgctxt "abbrev. month"
-msgid "Dec."
-msgstr ""
-
-#: utils/dates.py:45
-msgctxt "alt. month"
-msgid "January"
-msgstr ""
-
-#: utils/dates.py:46
-msgctxt "alt. month"
-msgid "February"
-msgstr ""
-
-#: utils/dates.py:47
-msgctxt "alt. month"
-msgid "March"
-msgstr ""
-
-#: utils/dates.py:48
-msgctxt "alt. month"
-msgid "April"
-msgstr ""
-
-#: utils/dates.py:49
-msgctxt "alt. month"
-msgid "May"
-msgstr ""
-
-#: utils/dates.py:50
-msgctxt "alt. month"
-msgid "June"
-msgstr ""
-
-#: utils/dates.py:51
-msgctxt "alt. month"
-msgid "July"
-msgstr ""
-
-#: utils/dates.py:52
-msgctxt "alt. month"
-msgid "August"
-msgstr ""
-
-#: utils/dates.py:53
-msgctxt "alt. month"
-msgid "September"
-msgstr ""
-
-#: utils/dates.py:54
-msgctxt "alt. month"
-msgid "October"
-msgstr ""
-
-#: utils/dates.py:55
-msgctxt "alt. month"
-msgid "November"
-msgstr ""
-
-#: utils/dates.py:56
-msgctxt "alt. month"
-msgid "December"
-msgstr ""
-
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
-msgid "This is not a valid IPv6 address."
-msgstr ""
-
-#: utils/text.py:69
-#, python-format
-msgctxt "String to return when truncating text"
-msgid "%(truncated_text)s..."
-msgstr ""
-
-#: utils/text.py:224
-msgid "or"
-msgstr ""
-
-#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
-msgid ", "
-msgstr ""
-
-#: utils/timesince.py:24
-#, python-format
-msgid "%d year"
-msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: utils/timesince.py:25
-#, python-format
-msgid "%d month"
-msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: utils/timesince.py:26
-#, python-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: utils/timesince.py:27
-#, python-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: utils/timesince.py:28
-#, python-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: utils/timesince.py:29
-#, python-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: utils/timesince.py:45
-msgid "0 minutes"
-msgstr ""
-
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr ""
-
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr ""
-
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr ""
-
-#: views/generic/dates.py:42
-msgid "No year specified"
-msgstr ""
-
-#: views/generic/dates.py:98
-msgid "No month specified"
-msgstr ""
-
-#: views/generic/dates.py:157
-msgid "No day specified"
-msgstr ""
-
-#: views/generic/dates.py:213
-msgid "No week specified"
-msgstr ""
-
-#: views/generic/dates.py:368 views/generic/dates.py:396
-#, python-format
-msgid "No %(verbose_name_plural)s available"
-msgstr ""
-
-#: views/generic/dates.py:649
-#, python-format
-msgid ""
-"Future %(verbose_name_plural)s not available because %(class_name)s."
-"allow_future is False."
-msgstr ""
-
-#: views/generic/dates.py:681
-#, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
-
-#: views/generic/detail.py:54
-#, python-format
-msgid "No %(verbose_name)s found matching the query"
-msgstr ""
-
-#: views/generic/list.py:54
-msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
-
-#: views/generic/list.py:59
-#, python-format
-msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr ""
-
-#: views/generic/list.py:150
-#, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
diff -Nru python-django-1.6.6/django/conf/locale/ga/formats.py python-django-1.7.4/django/conf/locale/ga/formats.py
--- python-django-1.6.6/django/conf/locale/ga/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ga/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -7,18 +7,18 @@
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'j F Y'
TIME_FORMAT = 'H:i:s'
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'j M Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/ga/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ga/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/ga/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ga/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/ga/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ga/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -3,17 +3,17 @@
# Translators:
# Jannis Leidel , 2011
# John Moylan , 2013
-# jstafford_rte , 2013
-# leftmostcat , 2011
+# John Stafford , 2013
+# Seán de Búrca , 2011
# Michael Thornhill , 2011-2012
# Séamus Ó Cúile , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-11-29 15:41+0000\n"
-"Last-Translator: John Moylan \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
"ga/)\n"
"MIME-Version: 1.0\n"
@@ -32,6 +32,10 @@
msgstr "Araibis"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Asarbaiseáinis"
@@ -84,323 +88,351 @@
msgstr "Béarla"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Béarla na Breataine"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Spáinnis"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Spáinnis na hAirgintíne"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Spáinnis Mheicsiceo "
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Spáinnis Nicearagua"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Eastóinis"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Bascais"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Peirsis"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Fionlainnis"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Fraincis"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Freaslainnis"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Gaeilge"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Gailísis"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Eabhrais"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hiondúis"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Cróitis"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Ungáiris"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indinéisis"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Íoslainnis"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Iodáilis"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Seapáinis"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Seoirsis"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Ciméiris"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Cannadais"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Cóiréis"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Liotuáinis"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Laitvis"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Macadóinis"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Mailéalaimis"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongóilis"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Ioruais Bokmål"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Ollainnis"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Ioruais Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Puinseáibis"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Polainnis"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portaingéilis"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Portaingéilis na Brasaíle"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Rómáinis"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Rúisis"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slóvaicis"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Slóivéinis"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albáinis"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Seirbis"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Seirbis (Laidineach)"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Sualainnis"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr ""
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamailis"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Teileagúis"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Téalainnis"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Tuircis"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr ""
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Úcráinis"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdais"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vítneamais"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Sínis Simplithe"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Sínis Traidisiúnta"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Iontráil luach bailí"
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Iontráil URL bailí."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Iontráil 'slug' bailí a chuimsíonn litreacha, uimhreacha, fostríoca nó "
"fleiscíní."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Iontráil seoladh IPv4 bailí."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Cuir seoladh bailí IPv6 isteach."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Cuir seoladh bailí IPv4 nó IPv6 isteach."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Ná hiontráil ach digití atá deighilte le camóga."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Cinntigh go bhfuil an luach seo %(limit_value)s (tá sé %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Cinntigh go bhfuil an luach seo níos lú ná nó cothrom le %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Cinntigh go bhfuil an luach seo níos mó ná nó cothrom le %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -414,7 +446,7 @@
msgstr[3] ""
msgstr[4] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -428,233 +460,241 @@
msgstr[3] ""
msgstr[4] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "Ní mór a bheith %(field_name)s uathúil ar %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "agus"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Tá %(model_name)s leis an %(field_label)s seo ann cheana."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Ní cheadaítear luach nialasach sa réimse seo."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Ní cheadaítear luach nialasach sa réimse seo."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Tá %(model_name)s leis an %(field_label)s seo ann cheana."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Réimse de Cineál: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Slánuimhir"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boole"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Teaghrán (suas go %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Slánuimhireacha camóg-scartha"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Dáta (gan am)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Dáta (le am)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Uimhir deachúlach"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "R-phost"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Conair comhaid"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Snámhphointe"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Mór (8 byte) slánuimhi"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Seoladh IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Seoladh IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boole (Fíor, Bréagach nó Dada)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Slánuimhir dearfach"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Slánuimhir beag dearfach"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (suas go %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Slánuimhir beag"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Téacs"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Am"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Comhaid"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Íomhá"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Eochair Eachtracha (cineál a chinnfear de réir réimse a bhaineann)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Duine-le-duine caidreamh"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Go leor le go leor caidreamh"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Tá an réimse seo riachtanach."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Iontráil slánuimhir."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Iontráil uimhir."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
@@ -664,7 +704,7 @@
msgstr[3] ""
msgstr[4] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
@@ -674,7 +714,7 @@
msgstr[3] ""
msgstr[4] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -686,31 +726,31 @@
msgstr[3] ""
msgstr[4] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Iontráil dáta bailí."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Iontráil am bailí."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Iontráil dáta/am bailí."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Níor seoladh comhad. Deimhnigh cineál an ionchódaithe ar an bhfoirm."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Níor seoladh aon chomhad."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Tá an comhad a seoladh folamh."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -721,13 +761,13 @@
msgstr[3] ""
msgstr[4] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Cuir ceachtar isteach comhad nó an ticbhosca soiléir, ní féidir an dá "
"sheiceáil."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -735,21 +775,25 @@
"Uasluchtaigh íomhá bhailí. Níorbh íomhá é an comhad a d'uasluchtaigh tú, nó "
"b'íomhá thruaillithe é."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Déan rogha bhailí. Ní ceann de na roghanna é %(value)s."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Cuir liosta de luachanna isteach."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -757,15 +801,15 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
@@ -775,27 +819,37 @@
msgstr[3] ""
msgstr[4] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ord"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Scrios"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Le do thoil ceartaigh an sonra dúbail le %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Ceart le do thoil na sonraí a dhúbailt le haghaidh %(field)s, chaithfidh a "
"bheith uathúil."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -804,33 +858,33 @@
"Ceart le do thoil na sonraí a dhúbailt le haghaidh %(field_name)s ní mór a "
"bheith uaithúil le haghaidh an %(lookup)s i %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Le do thoil ceartaigh na luachanna dúbail thíos."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Ní raibh an eochair eachtrach comhoiriúnach leis an tuismitheoir ásc príomh-"
"eochair."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Déan rogha bhailí. Ní ceann de na roghanna é do roghasa."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Ar ríomhaire Mac, coinnigh an eochair \"Control\" nó \"Command\" síos chun "
"níos mó ná rud amháin a roghnú."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -839,15 +893,15 @@
"Ní féidir an %(datetime)s a léirmhíniú i gcrios ama %(current_timezone)s; "
"B'fhéidir go bhfuil sé débhríoch nó nach bhfuil sé ann."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Faoi láthair"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Athraigh"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Glan"
@@ -863,11 +917,11 @@
msgid "No"
msgstr "Níl"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "tá, níl, b'fhéidir"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -877,52 +931,52 @@
msgstr[3] "%(size)d mbeart"
msgstr[4] "%(size)d beart"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "i.n."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "r.n."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "IN"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "RN"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "meán oíche"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "nóin"
@@ -1198,36 +1252,26 @@
msgid "December"
msgstr "Mí na Nollag"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "nó"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
@@ -1237,7 +1281,7 @@
msgstr[3] ""
msgstr[4] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
@@ -1247,7 +1291,7 @@
msgstr[3] ""
msgstr[4] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -1257,7 +1301,7 @@
msgstr[3] ""
msgstr[4] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
@@ -1267,7 +1311,7 @@
msgstr[3] ""
msgstr[4] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -1277,7 +1321,7 @@
msgstr[3] ""
msgstr[4] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -1287,46 +1331,72 @@
msgstr[3] ""
msgstr[4] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Níl innéacsanna chomhadlann cheadaítear anseo."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "Níl %(path)s ann."
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Innéacs de %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Bliain gan sonrú"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Mí gan sonrú"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Lá gan sonrú"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Seachtain gan sonrú"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Gan %(verbose_name_plural)s ar fáil"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1335,7 +1405,7 @@
"Níl %(verbose_name_plural)s sa todhchaí ar fáil mar tá %(class_name)s."
"allow_future Bréagach."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1346,17 +1416,31 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Níl bhfuarthas %(verbose_name)s le hadhaigh an iarratas"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Ní 'deireanach' é an leathanach, agus ní féidir é a thiontú go slánuimhir."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Liosta folamh agus tá '%(class_name)s .allow_empty' Bréagach."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Níl innéacsanna chomhadlann cheadaítear anseo."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "Níl %(path)s ann."
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Innéacs de %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/gl/formats.py python-django-1.7.4/django/conf/locale/gl/formats.py
--- python-django-1.6.6/django/conf/locale/gl/formats.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/gl/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,13 +12,13 @@
MONTH_DAY_FORMAT = r'j \d\e F'
SHORT_DATE_FORMAT = 'd-m-Y'
SHORT_DATETIME_FORMAT = 'd-m-Y, H:i'
-FIRST_DAY_OF_WEEK = 1 # Monday
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/gl/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/gl/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/gl/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/gl/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/gl/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/gl/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -9,11 +9,11 @@
# Oscar Carballal , 2012
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-09-07 11:41+0000\n"
-"Last-Translator: Leandro Regueiro \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
"gl/)\n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,10 @@
msgstr "Árabe"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "azerí"
@@ -83,321 +87,349 @@
msgstr "Inglés"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "inglés británico"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "español"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "español da Arxentina"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "español de México"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "español de Nicaragua"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "español de Venezuela"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "estoniano"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "vasco"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "finés"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Francés"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "frisón"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "irlandés"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galego"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebreo"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "croata"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Húngaro"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "indonesio"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "islandés"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "xaponés"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "xeorxiano"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "casaco"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "camboxano"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "canará"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "coreano"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "luxemburgués"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "lituano"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "letón"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "macedonio"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "mala"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "mongol"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "birmano"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "noruegués (bokmål)"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "nepalés"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "holandés"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "noruegués (nynorsk)"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "osetio"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "panxabiano"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "polaco"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "portugués"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "portugués do Brasil"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "romanés"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "ruso"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "eslovaco"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "esloveno"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "albanés"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "serbio"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "serbio (alfabeto latino)"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "sueco"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "suahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "támil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "tai"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "tártaro"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "udmurt"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ucraíno"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "chinés simplificado"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "chinés tradicional"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Insira un valor válido."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Insira un URL válido."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr "Introduza un enteiro válido."
+msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Insira un enderezo de correo electrónico válido."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Insira un 'slug' valido composto por letras, números, guións baixos ou "
"medios."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Insira unha dirección IPv4 válida."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Insira unha dirección IPv6 válida"
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Insira unha dirección IPv4 ou IPv6 válida"
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Insira só díxitos separados por comas."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Asegúrese de que este valor é %(limit_value)s (agora é %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Asegure que este valor é menor ou igual a %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Asegure que este valor é maior ou igual a %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -408,7 +440,7 @@
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -419,250 +451,256 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"O campo %(field_name)s debe ser único para a busca %(lookup)s en "
-"%(date_field)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "e"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
msgstr ""
-"Xa existe un modelo %(model_name)s coa etiqueta de campo %(field_label)s."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Este campo non pode ser nulo."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Este campo non pode estar baleiro."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr ""
+"Xa existe un modelo %(model_name)s coa etiqueta de campo %(field_label)s."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo de tipo: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Número enteiro"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Valor booleano (verdadeiro ou falso)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadea (máximo %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Números enteiros separados por comas"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Data (sen a hora)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Data (coa hora)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Enderezo electrónico"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Ruta de ficheiro"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Número en coma flotante"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Enteiro grande (8 bytes)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Enderezo IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Enderezo IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (verdadeiro, falso ou ningún)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Numero enteiro positivo"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Enteiro pequeno positivo"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (ata %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Enteiro pequeno"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Datos binarios en bruto"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Ficheiro"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Imaxe"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Clave Estranxeira (tipo determinado por un campo relacionado)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Relación un a un"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Relación moitos a moitos"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Requírese este campo."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Insira un número enteiro."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Insira un número."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -671,32 +709,32 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Insira unha data válida."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Insira unha hora válida."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Insira unha data/hora válida."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Non se enviou ficheiro ningún. Comprobe o tipo de codificación do formulario."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Non se enviou ficheiro ningún."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "O ficheiro enviado está baleiro."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -704,13 +742,13 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Ou ben envíe un ficheiro, ou ben marque a casilla de eliminar, pero non "
"ambas as dúas cousas."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -718,23 +756,27 @@
"Suba unha imaxe válida. O ficheiro subido non era unha imaxe ou esta estaba "
"corrupta."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Escolla unha opción válida. %(value)s non se atopa entre as opcións "
"dispoñibles."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Insira unha lista de valores."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -742,40 +784,47 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Orde"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Corrixa os datos duplicados no campo %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Corrixa os datos duplicados no campo %(field)s, que debe ser único."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -784,34 +833,34 @@
"Corrixa os datos duplicados no campo %(field_name)s, que debe ser único para "
"a busca %(lookup)s no campo %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Corrixa os valores duplicados de abaixo."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"A clave estranxeira en liña non coincide coa clave primaria da instancia nai."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Escolla unha opción válida. Esta opción non se atopa entre as opcións "
"dispoñíbeis"
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
" Para seleccionar máis dunha entrada, manteña premida a tecla \"Control\", "
"ou \"Comando\" nun Mac."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -820,15 +869,15 @@
"%(datetime)s non se puido interpretar na zona hora horaria "
"%(current_timezone)s; pode ser ambiguo ou non existir."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Actualmente"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Limpar"
@@ -844,63 +893,63 @@
msgid "No"
msgstr "Non"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "si,non,quizais"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "medianoite"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "mediodía"
@@ -1176,117 +1225,133 @@
msgid "December"
msgstr "decembro"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr "Isto non é un enderezo IPv6 válido."
+msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "ou"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d ano"
msgstr[1] "%d anos"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d mes"
msgstr[1] "%d meses"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d día"
msgstr[1] "%d días"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minutos"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Os índices de directorio non están permitidos aquí."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" non existe"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Índice de %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Non se especificou ningún ano"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Non se especificou ningún mes"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Non se especificou ningún día"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Non se especificou ningunha semana"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Non hai %(verbose_name_plural)s dispoñibles"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1295,7 +1360,7 @@
"Non hai dispoñibles %(verbose_name_plural)s futuros/as porque %(class_name)s."
"allow_futuro é False"
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "A cadea de data '%(datestr)s' non é válida para o formato '%(format)s'"
@@ -1305,16 +1370,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Non se atopou ningún/ha %(verbose_name)s que coincidise coa consulta"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "A páxina non é 'last' nin se pode converter a int."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Páxina non válida (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "A lista está baleira pero '%(class_name)s.allow_empty' é False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Os índices de directorio non están permitidos aquí."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" non existe"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Índice de %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/he/formats.py python-django-1.7.4/django/conf/locale/he/formats.py
--- python-django-1.6.6/django/conf/locale/he/formats.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/he/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,13 +12,13 @@
MONTH_DAY_FORMAT = 'j בF'
SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y H:i:s'
-# FIRST_DAY_OF_WEEK =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/he/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/he/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/he/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/he/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/he/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/he/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -3,14 +3,14 @@
# Translators:
# Alex Gaynor , 2011-2012
# Jannis Leidel , 2011
-# Meir Kriheli , 2011-2013
+# Meir Kriheli , 2011-2014
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-11-02 12:31+0000\n"
-"Last-Translator: Meir Kriheli \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
"he/)\n"
"MIME-Version: 1.0\n"
@@ -28,6 +28,10 @@
msgstr "ערבית"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "אזרית"
@@ -80,318 +84,346 @@
msgstr "אנגלית"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "אנגלית אוסטרלית"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "אנגלית בריטית"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "אספרנטו"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "ספרדית"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "ספרדית ארגנטינית"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "ספרדית מקסיקנית"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "ספרדית ניקרגואה"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "ספרדית ונצואלית"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "אסטונית"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "בסקית"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "פרסית"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "פינית"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "צרפתית"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "פריזית"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "אירית"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "גאליציאנית"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "עברית"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "הינדי"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "קרואטית"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "הונגרית"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "אינטרלינגואה"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "אינדונזית"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "איסלנדית"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "איטלקית"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "יפנית"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "גיאורגית"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "קזחית"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "חמר"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "קאנאדה"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "קוריאנית"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "לוקסמבורגית"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "ליטאית"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "לטבית"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "מקדונית"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "מלאיאלאם"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "מונגולי"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "בּוּרְמֶזִית"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "נורבגית ספרותית"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "נפאלית"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "הולנדית"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "נורבגית חדשה"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "אוסטית"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "פנג'אבי"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "פולנית"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "פורטוגזית"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "פורטוגזית ברזילאית"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "רומנית"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "רוסית"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "סלובקית"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "סלובנית"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "אלבנית"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "סרבית"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "סרבית לטינית"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "שוודית"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "סווהילי"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "טמילית"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "טלגו"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "תאילנדית"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "טורקית"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "טטרית"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "אודמורטית"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "אוקראינית"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "אורדו"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "וייטנאמית"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "סינית פשוטה"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "סינית מסורתית"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "מפות אתר"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "קבצים סטטיים"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "הפצת תכנים"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "עיצוב אתרים"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "יש להזין ערך חוקי."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "יש להזין URL חוקי."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr "יש להזין מספר שלם חוקי."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "נא להזין כתובת דוא\"ל חוקית"
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "יש להזין ערך המכיל אותיות, ספרות, קווים תחתונים ומקפים בלבד."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "יש להזין כתובת IPv4 חוקית."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "יש להזין כתובת IPv6 חוקית."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "יש להזין כתובת IPv4 או IPv6 חוקית."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "יש להזין רק ספרות מופרדות בפסיקים."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "יש לוודא שערך זה הינו %(limit_value)s (כרגע %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "יש לוודא שערך זה פחות מ או שווה ל־%(limit_value)s ."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "יש לוודא שהערך גדול מ או שווה ל־%(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -404,7 +436,7 @@
msgstr[1] ""
"נא לוודא שערך זה מכיל %(limit_value)d תווים לכל הפחות (מכיל %(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -417,66 +449,75 @@
msgstr[1] ""
"נא לוודא שערך זה מכיל %(limit_value)d תווים לכל היותר (מכיל %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s חייב להיות ייחודי ל%(lookup)s של ה־%(date_field)s"
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "ו"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s·עם·%(field_label)s·זה קיימת כבר."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s·עם·%(field_labels)s·אלו קיימים כבר."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr "ערך %(value)r אינו אפשרות חוקית."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "שדה זה אינו יכול להיות ריק."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "שדה זה אינו יכול להיות ריק."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s·עם·%(field_label)s·זה קיימת כבר."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s חייב להיות ייחודי עבור %(date_field_label)s %(lookup_type)s."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "שדה מסוג: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "מספר שלם"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr "הערך '%(value)s' חייב להיות מספר שלם."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr "הערך '%(value)s' חייב להיות אמת או שקר."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "בוליאני (אמת או שקר)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "מחרוזת (עד %(max_length)s תווים)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "מספרים שלמים מופרדים בפסיקים"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
@@ -484,18 +525,18 @@
msgstr ""
"הערך '%(value)s' מכיל פורמט תאריך לא חוקי. חייב להיות בפורמט YYYY-MM-DD."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr "הערך '%(value)s' בפורמט הנכון (YYYY-MM-DD), אך אינו תאריך חוקי."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "תאריך (ללא שעה)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
@@ -504,7 +545,7 @@
"הערך '%(value)s' מכיל פורמט לא חוקי. הוא חייב להיות בפורמטYYYY-MM-DD HH:MM[:"
"ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
@@ -513,79 +554,79 @@
"הערך '%(value)s' הוא בפורמט הנכון (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) אך "
"אינו מהווה תאריך/שעה חוקיים."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "תאריך (כולל שעה)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr "הערך '%(value)s' חייב להיות מספר עשרוני."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "מספר עשרוני"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "כתובת דוא\"ל"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "נתיב קובץ"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr "הערך '%(value)s' חייב להיות מספר עם נקודה צפה."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "מספר עשרוני"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "מספר שלם גדול (8 בתים)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "כתובת IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "כתובת IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr "הערך '%(value)s' חייב להיות None, אמת או שקר."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "בוליאני (אמת, שקר או כלום)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "מספר שלם חיובי"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "מספר שלם חיובי קטן"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (עד %(max_length)s תווים)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "מספר שלם קטן"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "טקסט"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
@@ -593,7 +634,7 @@
msgstr ""
"הערך '%(value)s' מכיל פורמט לא חוקי. חייב להיות בפורמט HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
@@ -601,70 +642,70 @@
msgstr ""
"הערך '%(value)s' בעל פורמט חוקי (HH:MM[:ss[.uuuuuu]]) אך אינו זמן חוקי."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "זמן"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "מידע בינארי גולמי"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "קובץ"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "תמונה"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr "פריט %(model)s עם מפתח ראשי %(pk)r אינו קיים."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (הסוג נקבע לפי השדה המקושר)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "יחס של אחד לאחד"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "יחס של רבים לרבים"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "יש להזין תוכן בשדה זה."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "נא להזין מספר שלם."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "נא להזין מספר."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "נא לוודא שאין יותר מספרה %(max)s בסה\"כ."
msgstr[1] "נא לוודא שאין יותר מ־%(max)s ספרות בסה\"כ."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] "נא לוודא שאין יותר מספרה %(max)s אחרי הנקודה."
msgstr[1] "נא לוודא שאין יותר מ־%(max)s ספרות אחרי הנקודה."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -673,31 +714,31 @@
msgstr[0] "נא לוודא שאין יותר מספרה %(max)s לפני הנקודה העשרונית"
msgstr[1] "נא לוודא שאין יותר מ־%(max)s ספרות לפני הנקודה העשרונית"
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "יש להזין תאריך חוקי."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "יש להזין שעה חוקית."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "יש להזין תאריך ושעה חוקיים."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "לא נשלח שום קובץ. נא לבדוק את סוג הקידוד של הטופס."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "לא נשלח שום קובץ"
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "הקובץ שנשלח ריק."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -706,31 +747,35 @@
msgstr[1] ""
"נא לוודא ששם קובץ זה מכיל %(max)d תווים לכל היותר (מכיל %(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "נא לשים קובץ או סימן את התיבה לניקוי, לא שניהם."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "נא להעלות תמונה חוקית. הקובץ שהעלת אינו תמונה או מכיל תמונה מקולקלת."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "יש לבחור אפשרות חוקית. %(value)s אינו בין האפשרויות הזמינות."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "יש להזין רשימת ערכים"
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "יש להזין ערך שלם."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(שדה מוסתר %(name)s) %(error)s"
@@ -738,40 +783,47 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr "מידע ManagementForm חסר או התעסקו איתו."
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "נא לשלוח טופס %d לכל היותר."
msgstr[1] "נא לשלוח %d טפסים לכל היותר."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "נא לשלוח טופס %d או יותר."
+msgstr[1] "נא לשלוח %d טפסים או יותר."
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "מיון"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "מחיקה"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "נא לתקן את הערכים הכפולים ל%(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "נא לתקן את הערכים הכפולים ל%(field)s, שערכים בו חייבים להיות ייחודיים."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -780,30 +832,30 @@
"נא לתקן את הערכים הכפולים %(field_name)s, שחייבים להיות ייחודיים ל%(lookup)s "
"של %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "נא לתקן את הערכים הכפולים למטה."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "המפתח הזר ה־inline לא התאים למפתח הראשי של האב."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "יש לבחור אפשרות חוקית; אפשרות זו אינה אחת מהזמינות."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" אינו ערך חוקי עבור מפתח ראשי."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"יש להחזיק את \"Control\", או \"Command\" על מק, לחוץ כדי לבחור יותר מאחד."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -812,15 +864,15 @@
"לא ניתן לפרש את %(datetime)s באזור זמן %(current_timezone)s; הוא עשוי להיות "
"דו-משמעי או לא קיים."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "עכשיו"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "שינוי"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "לסלק"
@@ -836,63 +888,63 @@
msgid "No"
msgstr "לא"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "כן,לא,אולי"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "בית %(size)d "
msgstr[1] "%(size)d בתים"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s ק\"ב"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s מ\"ב"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s ג\"ב"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s ט\"ב"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s פ\"ב"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "אחר הצהריים"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "בבוקר"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "אחר הצהריים"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "בבוקר"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "חצות"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "12 בצהריים"
@@ -1168,117 +1220,142 @@
msgid "December"
msgstr "דצמבר"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "לא ניתן לייבא את Pillow או את PIL: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "לא ניתן לייבא את מודול ה־'_imaging' של PIL: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "זו אינה כתובת IPv6 חוקית."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "או"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "שנה %d"
msgstr[1] "%d שנים"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "חודש %d"
msgstr[1] "%d חודשים"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "שבוע %d"
msgstr[1] "%d שבועות"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "יום %d"
msgstr[1] "%d ימים"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "שעה %d"
msgstr[1] "%d שעות"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "דקה %d"
msgstr[1] "%d דקות"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 דקות"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "אינדקסים על תיקיה אסורים כאן."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "אסור"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "אימות CSRF נכשל. הבקשה בוטלה."
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" אינו קיים"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"הודעה זו מופיעה מאחר ואתר HTTPS זה דורש שליחת 'Referer header' על ידי הדפדפן "
+"שלך, אשר לא נשלח. הדבר נדרש מסיבות אבטחה, כדי לוודא שהדפדפן שלך לא נחטף על "
+"ידי אחרים."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "אינדקס של %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"אם הגדרת את הדפדפן שלך לביטול 'Referer' headers, נא לאפשר אותם, לפחות עבור "
+"אתר זה, לחיבורי HTTPS או לבקשות 'same-origin'."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"הודעה זו מופיעה מאחר ואתר זה דורש עוגיית CSRF כאשר שולחים טפסים. עוגיה זו "
+"נדרשת מסיבות אבטחה, כדי לוודא שהדפדפן שלך לא נחטף על ידי אחרים."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"אם הגדרת את הדפדפן שלך לנטרול עוגיות, נא לאפשר אותם שוב, לפחות עבור אתר זה "
+"או לבקשות 'same-origin'."
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "מידע נוסף זמין עם "
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "לא צויינה שנה"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "לא צויין חודש"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "לא צויין יום"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "לא צויין שבוע"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "לא נמצאו %(verbose_name_plural)s"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1287,7 +1364,7 @@
"לא נמצאו %(verbose_name_plural)s בזמן עתיד מאחר ש-%(class_name)s."
"allow_future מוגדר False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "מחרוזת תאריך לא חוקית '%(datestr)s' בהתחשב בתחביר '%(format)s'"
@@ -1297,16 +1374,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "לא נמצא/ה %(verbose_name)s התואם/ת לשאילתה"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "העמוד אינו 'last', או אינו ניתן להמרה למספר."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "עמוד לא חוקי (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "רשימה ריקה -ו'%(class_name)s.allow_empty' מוגדר False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "אינדקסים על תיקיה אסורים כאן."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" אינו קיים"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "אינדקס של %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/hi/formats.py python-django-1.7.4/django/conf/locale/hi/formats.py
--- python-django-1.6.6/django/conf/locale/hi/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/hi/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -7,18 +7,18 @@
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'j F Y'
TIME_FORMAT = 'g:i:s A'
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'd-m-Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/hi/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/hi/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/hi/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/hi/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/hi/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/hi/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -1,16 +1,16 @@
# This file is distributed under the same license as the Django package.
#
# Translators:
-# आलोक कुमार , 2013
+# alkuma , 2013
# Chandan kumar , 2012
# Jannis Leidel , 2011
-# pratik kumar , 2013
+# Pratik , 2013
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
"hi/)\n"
@@ -29,6 +29,10 @@
msgstr "अरबी"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "आज़रबाइजानी"
@@ -81,320 +85,348 @@
msgstr "अंग्रेज़ी "
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "ब्रिटिश अंग्रेजी"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "एस्परेन्तो"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "स्पानिश"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "अर्जेंटीना स्पैनिश "
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "मेक्सिकन स्पैनिश"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "निकारागुआ स्पैनिश"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "वेनेज़ुएलाई स्पेनिश"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "एस्टोनियन"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "बास्क"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "पारसी"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "फ़िन्निश"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "फ्रेंच"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "फ्रिसियन"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "आयरिश"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "गलिशियन"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "हिब्रू"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "हिंदी"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "क्रोयेशियन"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "हंगेरियन"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "इंतर्लिंगुआ"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "इन्डोनेशियन "
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "आयिस्लान्डिक"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "इटैलियन"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "जपानी"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "ज्योर्जियन"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "कज़ाख"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "ख्मेर"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "कन्नड़"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "कोरियन"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "लक्संबर्गी"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "लिथुवेनियन"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "लात्वियन"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "मेसिडोनियन"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "मलयालम"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "मंगोलियन"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "बर्मीज़"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "नार्वेजियन बोकमाल"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "नेपाली"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "डच"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "नार्वेजियन नायनॉर्स्क"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "ओस्सेटिक"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "पंजाबी"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "पोलिश"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "पुर्तगाली"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "ब्रजिलियन पुर्तगाली"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "रोमानियन"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "रूसी"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "स्लोवाक"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "स्लोवेनियन"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "अल्बेनियन्"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "सर्बियन"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "सर्बियाई लैटिन"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "स्वीडिश"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "स्वाहिली"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "तमिल"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "तेलुगु"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "थाई"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "तुर्किश"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "तातार"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "उद्मर्त"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "यूक्रानियन"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "उर्दू"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "वियतनामी"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "सरल चीनी"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "पारम्परिक चीनी"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "एक मान्य मूल्य दर्ज करें"
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "वैध यू.आर.एल भरें ।"
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "वैध डाक पता प्रविष्ट करें।"
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "एक वैध 'काउंटर' वर्णों, संख्याओं,रेखांकित चिन्ह ,या हाइफ़न से मिलाकर दर्ज करें ।"
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "वैध आइ.पि वी 4 पता भरें ।"
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "वैध IPv6 पता दर्ज करें."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "वैध IPv4 या IPv6 पता दर्ज करें."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "अल्पविराम अंक मात्र ही भरें ।"
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"सुनिश्चित करें कि यह मान %(limit_value)s (यह\n"
" %(show_value)s है) है ।"
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "सुनिश्चित करें कि यह मान %(limit_value)s से कम या बराबर है ।"
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "सुनिश्चित करें यह मान %(limit_value)s से बड़ा या बराबर है ।"
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -405,7 +437,7 @@
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -416,247 +448,255 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr " %(date_field)s %(lookup)s के लिए %(field_name)s अद्वितीय होना चाहिए."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "और"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "इस %(field_label)s के साथ एक %(model_name)s पहले से ही उपस्थित है ।"
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "यह मूल्य खाली नहीं हो सकता ।"
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "इस फ़ील्ड रिक्त नहीं हो सकता है."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "इस %(field_label)s के साथ एक %(model_name)s पहले से ही उपस्थित है ।"
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "फील्ड के प्रकार: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "पूर्णांक"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "बूलियन (सही अथवा गलत)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "स्ट्रिंग (अधिकतम लम्बाई %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "अल्पविराम सीमांकित संख्या"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "तिथि (बिना समय)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "तिथि (समय के साथ)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "दशमलव संख्या"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "ईमेल पता"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "संचिका पथ"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "चल बिन्दु संख्या"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "बड़ा (8 बाइट) पूर्णांक "
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 पता"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "आइ.पि पता"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "बूलियन (सही, गलत या कुछ नहीं)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "धनात्मक पूर्णांक"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "धनात्मक छोटा पूर्णांक"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "स्लग (%(max_length)s तक)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "छोटा पूर्णांक"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "पाठ"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "समय"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "यू.आर.एल"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "फाइल"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "छवि"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "विदेशी कुंजी (संबंधित क्षेत्र के द्वारा प्रकार निर्धारित)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "एक-एक संबंध"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "बहुत से कई संबंध"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "यह क्षेत्र अपेक्षित हैं"
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "एक पूर्ण संख्या दर्ज करें ।"
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "एक संख्या दर्ज करें ।"
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -665,31 +705,31 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "वैध तिथि भरें ।"
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "वैध समय भरें ।"
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "वैध तिथि/समय भरें ।"
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "कोई संचिका निवेदित नहीं हुई । कृपया कूटलेखन की जाँच करें ।"
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "कोई संचिका निवेदित नहीं हुई ।"
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "निवेदित संचिका खाली है ।"
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -697,31 +737,35 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "कृपया या फ़ाइल प्रस्तुत करे या साफ जांचपेटी की जाँच करे,दोनों नहीं ."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "वैध चित्र निवेदन करें । आप के द्वारा निवेदित संचिका अमान्य अथवा दूषित है ।"
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "मान्य इच्छा चयन करें । %(value)s लभ्य इच्छाओं में उप्लब्ध नहीं हैं ।"
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "मूल्य सूची दर्ज करें ।"
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -729,40 +773,47 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "छाटें"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "मिटाएँ"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "कृपया %(field)s के लिए डुप्लिकेट डेटा को सही करे."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "कृपया %(field)s के डुप्लिकेट डेटा जो अद्वितीय होना चाहिए को सही करें."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -771,29 +822,29 @@
"कृपया %(field_name)s के लिए डुप्लिकेट डेटा को सही करे जो %(date_field)s में "
"%(lookup)s के लिए अद्वितीय होना चाहिए."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "कृपया डुप्लिकेट मानों को सही करें."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "इनलाइन विदेशी कुंजी पैरेंट आवृत्ति प्राथमिक कुंजी से मेल नहीं खाता है ."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "मान्य विकल्प चयन करें । यह विकल्प उपस्थित विकल्पों में नहीं है ।"
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "एक से अधिक का चयन करने के लिए मैक पर \"कमांड\",या\"नियंत्रण\" नीचे दबाए रखें."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -802,15 +853,15 @@
"%(current_timezone)s समय क्षेत्र में %(datetime)s का व्याख्या नहीं कर सकता है, यह "
"अस्पष्ट हो सकता है या नहीं मौजूद हो सकते हैं."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "फिलहाल"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "बदलें"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "रिक्त करें"
@@ -826,63 +877,63 @@
msgid "No"
msgstr "नहीं"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "हाँ, नहीं, शायद"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d बाइट"
msgstr[1] "%(size)d बाइट"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s केबी "
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s मेबी "
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s जीबी "
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s टीबी"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s पीबी"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "बजे"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "बजे"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "बजे"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "बजे"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "मध्यरात्री"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "दोपहर"
@@ -1158,117 +1209,133 @@
msgid "December"
msgstr "दिसंबर"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "अथवा"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "निर्देशिका अनुक्रमित की अनुमति यहाँ नहीं है."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" मौजूद नहीं है"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "%(directory)s का अनुक्रमणिका"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "कोई साल निर्दिष्ट नहीं किया गया "
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "कोई महीने निर्दिष्ट नहीं किया गया "
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "कोई दिन निर्दिष्ट नहीं किया गया "
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "कोई सप्ताह निर्दिष्ट नहीं किया गया "
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s उपलब्ध नहीं है"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1277,7 +1344,7 @@
"भविष्य %(verbose_name_plural)s उपलब्ध नहीं है क्योंकि %(class_name)s.allow_future "
"गलत है."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "तिथि स्ट्रिंग '%(datestr)s' दिया गया प्रारूप '%(format)s' अवैध है "
@@ -1287,16 +1354,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr " इस प्रश्न %(verbose_name)s से मेल नहीं खाते है"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "पृष्ठ 'अंतिम' नहीं है और न ही यह एक पूर्णांक के लिए परिवर्तित किया जा सकता है."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "अवैध पन्ना (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "रिक्त सूची और '%(class_name)s.allow_empty' गलत है."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "निर्देशिका अनुक्रमित की अनुमति यहाँ नहीं है."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" मौजूद नहीं है"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s का अनुक्रमणिका"
diff -Nru python-django-1.6.6/django/conf/locale/hr/formats.py python-django-1.7.4/django/conf/locale/hr/formats.py
--- python-django-1.6.6/django/conf/locale/hr/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/hr/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -23,26 +23,26 @@
'%d. %m. %Y.', '%d. %m. %y.', # '25. 10. 2006.', '25. 10. 06.'
)
DATETIME_INPUT_FORMATS = (
- '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
- '%Y-%m-%d %H:%M:%S.%f', # '2006-10-25 14:30:59.000200'
- '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
- '%Y-%m-%d', # '2006-10-25'
- '%d.%m.%Y. %H:%M:%S', # '25.10.2006. 14:30:59'
- '%d.%m.%Y. %H:%M:%S.%f', # '25.10.2006. 14:30:59.000200'
- '%d.%m.%Y. %H:%M', # '25.10.2006. 14:30'
- '%d.%m.%Y.', # '25.10.2006.'
- '%d.%m.%y. %H:%M:%S', # '25.10.06. 14:30:59'
- '%d.%m.%y. %H:%M:%S.%f', # '25.10.06. 14:30:59.000200'
- '%d.%m.%y. %H:%M', # '25.10.06. 14:30'
- '%d.%m.%y.', # '25.10.06.'
- '%d. %m. %Y. %H:%M:%S', # '25. 10. 2006. 14:30:59'
- '%d. %m. %Y. %H:%M:%S.%f',# '25. 10. 2006. 14:30:59.000200'
- '%d. %m. %Y. %H:%M', # '25. 10. 2006. 14:30'
- '%d. %m. %Y.', # '25. 10. 2006.'
- '%d. %m. %y. %H:%M:%S', # '25. 10. 06. 14:30:59'
- '%d. %m. %y. %H:%M:%S.%f',# '25. 10. 06. 14:30:59.000200'
- '%d. %m. %y. %H:%M', # '25. 10. 06. 14:30'
- '%d. %m. %y.', # '25. 10. 06.'
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M:%S.%f', # '2006-10-25 14:30:59.000200'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+ '%d.%m.%Y. %H:%M:%S', # '25.10.2006. 14:30:59'
+ '%d.%m.%Y. %H:%M:%S.%f', # '25.10.2006. 14:30:59.000200'
+ '%d.%m.%Y. %H:%M', # '25.10.2006. 14:30'
+ '%d.%m.%Y.', # '25.10.2006.'
+ '%d.%m.%y. %H:%M:%S', # '25.10.06. 14:30:59'
+ '%d.%m.%y. %H:%M:%S.%f', # '25.10.06. 14:30:59.000200'
+ '%d.%m.%y. %H:%M', # '25.10.06. 14:30'
+ '%d.%m.%y.', # '25.10.06.'
+ '%d. %m. %Y. %H:%M:%S', # '25. 10. 2006. 14:30:59'
+ '%d. %m. %Y. %H:%M:%S.%f', # '25. 10. 2006. 14:30:59.000200'
+ '%d. %m. %Y. %H:%M', # '25. 10. 2006. 14:30'
+ '%d. %m. %Y.', # '25. 10. 2006.'
+ '%d. %m. %y. %H:%M:%S', # '25. 10. 06. 14:30:59'
+ '%d. %m. %y. %H:%M:%S.%f', # '25. 10. 06. 14:30:59.000200'
+ '%d. %m. %y. %H:%M', # '25. 10. 06. 14:30'
+ '%d. %m. %y.', # '25. 10. 06.'
)
DECIMAL_SEPARATOR = ','
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/hr/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/hr/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/hr/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/hr/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/hr/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/hr/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,18 +2,19 @@
#
# Translators:
# aljosa , 2011,2013
+# berislavlopac , 2013
# Bojan Mihelač , 2012
# Jannis Leidel , 2011
-# Ninopoopmap , 2013
+# Nino , 2013
# senko , 2012
# Ylodi , 2011
# zmasek , 2012
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
"hr/)\n"
@@ -33,6 +34,10 @@
msgstr "Arapski"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azarbejdžanac"
@@ -85,322 +90,350 @@
msgstr "Engleski"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Britanski engleski"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Španjolski"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Argentinski španjolski"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Meksički španjolski"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Nikaragvanski Španjolski"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Venezuelanski Španjolski"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estonski"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Baskijski"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Perzijski"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finski"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Francuski"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frizijski"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Irski"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galičanski"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebrejski"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Hrvatski"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Mađarski"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonezijski"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Islandski"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Talijanski"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japanski"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Gruzijski"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazaški"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Kambođanski"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Koreanski"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Luksemburški"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Litvanski"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Latvijski"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Makedonski"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongolski"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Norveški Bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepalski"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Nizozemski"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Norveški Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Pendžabljanin"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Poljski"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugalski"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Brazilski portugalski"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Rumunjski"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Ruski"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slovački"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Slovenski"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albanski"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Srpski"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Latinski srpski"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Švedski"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamilski"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Teluški"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Thai (tajlandski)"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turski"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatarski"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Udmurtski"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ukrajinski"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vijetnamski"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Pojednostavljeni kineski"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Tradicionalni kineski"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Unesite ispravnu vrijednost."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Unesite ispravan URL."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Unesite ispravnu e-mail adresu."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Unesite ispravan 'slug' koji se sastoji samo od slova, brojeva, povlaka ili "
"crtica."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Unesite ispravnu IPv4 adresu."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Unesite ispravnu IPv6 adresu."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Unesite ispravnu IPv4 ili IPv6 adresu."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Unesite samo brojeve razdvojene zarezom."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Osigurajte da ova vrijednost ima %(limit_value)s (trenutno je "
"%(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Osigurajte da je ova vrijednost manja ili jednaka %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Osigurajte da je ova vrijednost veća ili jednaka %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -409,10 +442,16 @@
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Osigurajte da ova vrijednost ima najmanje %(limit_value)d znak (trenutno ima "
+"%(show_value)d)."
msgstr[1] ""
+"Osigurajte da ova vrijednost ima najmanje %(limit_value)d znakova (trenutno "
+"ima %(show_value)d)."
msgstr[2] ""
+"Osigurajte da ova vrijednost ima najmanje %(limit_value)d znakova (trenutno "
+"ima %(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -421,237 +460,250 @@
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Osigurajte da ova vrijednost ima najviše %(limit_value)d znak (trenutno ima "
+"%(show_value)d)."
msgstr[1] ""
+"Osigurajte da ova vrijednost ima najviše %(limit_value)d znakova (trenutno "
+"ima %(show_value)d)."
msgstr[2] ""
+"Osigurajte da ova vrijednost ima najviše %(limit_value)d znakova (trenutno "
+"ima %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"%(field_name)s mora biti jedinstven pojam za %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "i"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s sa navedenim %(field_label)s već postoji."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Ovo polje ne može biti null."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Ovo polje ne može biti prazno."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s sa navedenim %(field_label)s već postoji."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Polje tipa: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Cijeli broj"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boolean (True ili False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Slova (do %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Cijeli brojevi odvojeni zarezom"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Datum (bez vremena/sati)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Datum (sa vremenom/satima)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Decimalni broj"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "E-mail adresa"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Put do datoteke"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Broj s pomičnim zarezom (floating point number)"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Big (8 byte) integer"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 adresa"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP adresa"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (True, False ili None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Pozitivan cijeli broj"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Pozitivan mali cijeli broj"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "'Slug' (do %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Mali broj"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Vrijeme"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Datoteka"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Slika"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (type determined by related field)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "One-to-one relationship"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Many-to-many relationship"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Unos za ovo polje je obavezan."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Unesite cijeli broj."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Unesite broj."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
@@ -659,7 +711,7 @@
msgstr[1] ""
msgstr[2] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
@@ -667,7 +719,7 @@
msgstr[1] ""
msgstr[2] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -677,31 +729,31 @@
msgstr[1] ""
msgstr[2] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Unesite ispravan datum."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Unesite ispravno vrijeme."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Unesite ispravan datum/vrijeme."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Datoteka nije poslana. Provjerite 'encoding type' forme."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Datoteka nije poslana."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Poslana datoteka je prazna."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -710,11 +762,11 @@
msgstr[1] ""
msgstr[2] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Molimo Vas da pošaljete ili datoteku ili označite izbor, a ne oboje."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -722,21 +774,25 @@
"Upload-ajte ispravnu sliku. Datoteka koju ste upload-ali ili nije slika ili "
"je oštečena."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Odaberite iz ponuđenog. %(value)s nije ponuđen kao opcija."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Unesite listu vrijednosti."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
-msgstr ""
+msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -744,43 +800,51 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
-msgstr ""
+msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
+msgstr[0] "Molimo unesite %d obrazac."
+msgstr[1] "Molimo unesite %d ili manje obrazaca."
+msgstr[2] "Molimo unesite %d ili manje obrazaca."
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Redoslijed:"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Izbriši"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ispravite duplicirane podatke za %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Molimo ispravite duplicirane podatke za %(field)s, koji moraju biti "
"jedinstveni."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -789,31 +853,31 @@
"Molimo ispravite duplicirane podatke za %(field_name)s koji moraju biti "
"jedinstveni za %(lookup)s u %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Molimo ispravite duplicirane vrijednosti ispod."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "The inline foreign key did not match the parent instance primary key."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Izaberite ispravnu opciju. Ta opcija nije jedna od dostupnih opcija."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Držite \"Control\", ili \"Command\" na Mac-u, da bi odabrali više od jednog "
"objekta."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -822,15 +886,15 @@
"%(datetime)s ne može biti interpretirano u vremenskoj zoni "
"%(current_timezone)s; možda je dvosmisleno ili ne postoji."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Trenutno"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Promijeni"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Isprazni"
@@ -846,11 +910,11 @@
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "da,ne,možda"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -858,52 +922,52 @@
msgstr[1] "%(size)d byte-a"
msgstr[2] "%(size)d byte-a"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "popodne"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "ujutro"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "popodne"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "ujutro"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "ponoć"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "podne"
@@ -1179,123 +1243,139 @@
msgid "December"
msgstr "prosinca"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "ili"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ","
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d godina"
+msgstr[1] "%d godina"
+msgstr[2] "%d godina"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d mjesec"
+msgstr[1] "%d mjeseci"
+msgstr[2] "%d mjeseci"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d tjedan"
+msgstr[1] "%d tjedna"
+msgstr[2] "%d tjedana"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d dana"
+msgstr[1] "%d dana"
+msgstr[2] "%d dana"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d sat"
+msgstr[1] "%d sati"
+msgstr[2] "%d sati"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d minutu"
+msgstr[1] "%d minute"
+msgstr[2] "%d minuta"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minuta"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Sadržaji direktorija ovdje nisu dozvoljeni."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" ne postoji"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Sadržaj direktorija %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Nije navedena godina"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Nije naveden mjesec"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Nije naveden dan"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Tjedan nije određen"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Nije dostupno: %(verbose_name_plural)s"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1304,7 +1384,7 @@
"%(verbose_name_plural)s nije dostupno jer je %(class_name)s.allow_future "
"False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Neispravan datum '%(datestr)s' za format '%(format)s'"
@@ -1314,16 +1394,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "%(verbose_name)s - pretragom nisu pronađeni rezultati za upit"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Stranica nije 'zadnja', niti se može pretvoriti u cijeli broj."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Nevažeća stranica (%(page_number)s):%(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Prazna lista i '%(class_name)s.allow_empty' je False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Sadržaji direktorija ovdje nisu dozvoljeni."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ne postoji"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Sadržaj direktorija %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/hu/formats.py python-django-1.7.4/django/conf/locale/hu/formats.py
--- python-django-1.6.6/django/conf/locale/hu/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/hu/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,23 +12,23 @@
MONTH_DAY_FORMAT = 'F j.'
SHORT_DATE_FORMAT = 'Y.m.d.'
SHORT_DATETIME_FORMAT = 'Y.m.d. G.i.s'
-FIRST_DAY_OF_WEEK = 1 # Monday
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
DATE_INPUT_FORMATS = (
- '%Y.%m.%d.', # '2006.10.25.'
+ '%Y.%m.%d.', # '2006.10.25.'
)
TIME_INPUT_FORMATS = (
- '%H.%M.%S', # '14.30.59'
+ '%H.%M.%S', # '14.30.59'
'%H.%M', # '14.30'
)
DATETIME_INPUT_FORMATS = (
'%Y.%m.%d. %H.%M.%S', # '2006.10.25. 14.30.59'
- '%Y.%m.%d. %H.%M.%S.%f', # '2006.10.25. 14.30.59.000200'
+ '%Y.%m.%d. %H.%M.%S.%f', # '2006.10.25. 14.30.59.000200'
'%Y.%m.%d. %H.%M', # '2006.10.25. 14.30'
'%Y.%m.%d.', # '2006.10.25.'
)
DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = ' ' # Non-breaking space
+THOUSAND_SEPARATOR = ' ' # Non-breaking space
NUMBER_GROUPING = 3
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/hu/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/hu/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/hu/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/hu/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/hu/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/hu/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -8,10 +8,10 @@
# Szilveszter Farkas , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
"language/hu/)\n"
@@ -30,6 +30,10 @@
msgstr "Arab"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "azerbajdzsáni"
@@ -82,322 +86,350 @@
msgstr "Angol"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Brit angol"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Eszperantó"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Spanyol"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Argentin spanyol"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Mexikói spanyol"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Nicaraguai spanyol"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Venezuelai spanyol"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Észt"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Baszk "
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Perzsa"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finn"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Francia"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Fríz"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Ír"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Gall"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Héber"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Horvát"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Magyar"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonéz"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Izlandi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Olasz"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japán"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Grúz"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazak"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Koreai"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Luxemburgi"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Litván"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Lett"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Macedón"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malajálam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongol"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "Burmai"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Bokmål norvég"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepáli"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Holland"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Nynorsk norvég"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "Oszét"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Lengyel"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugál"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Brazíliai portugál"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Román"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Orosz"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Szlovák"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Szlovén"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albán"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Szerb"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Latin betűs szerb"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Svéd"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Szuahéli"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Török"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatár"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Udmurt"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ukrán"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vietnámi"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Egyszerű kínai"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Hagyományos kínai"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Adjon meg egy érvényes értéket."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Adjon meg egy érvényes URL-t."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Írjon be egy érvényes e-mail címet."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Az URL barát cím csak betűket, számokat, aláhúzásokat és kötőjeleket "
"tartalmazhat."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Írjon be egy érvényes IPv4 címet."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Írjon be egy érvényes IPv6 címet."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Írjon be egy érvényes IPv4 vagy IPv6 címet."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Csak számokat adjon meg, vesszővel elválasztva."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Bizonyosodjon meg arról, hogy az érték %(limit_value)s (jelenleg: "
"%(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Bizonyosodjon meg arról, hogy az érték %(limit_value)s, vagy kisebb."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Bizonyosodjon meg arról, hogy az érték %(limit_value)s, vagy nagyobb."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -412,7 +444,7 @@
"Bizonyosodjon meg arról, hogy ez az érték legalább %(limit_value)d karaktert "
"tartalmaz (jelenlegi hossza: %(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -427,249 +459,255 @@
"Bizonyosodjon meg arról, hogy ez az érték legfeljebb %(limit_value)d "
"karaktert tartalmaz (jelenlegi hossza: %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"%(field_name)s egyedi kell hogy legyen %(lookup)s alapján a dátum mezőn: "
-"%(date_field)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "és"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Már létezik %(model_name)s ilyennel: %(field_label)s."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Ez a mező nem lehet nulla."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Ez a mező nem lehet üres."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Már létezik %(model_name)s ilyennel: %(field_label)s."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Mezőtípus: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Egész"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Logikai (True vagy False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Karakterlánc (%(max_length)s hosszig)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Vesszővel elválasztott egészek"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Dátum (idő nélkül)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Dátum (idővel)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Tizes számrendszerű (decimális) szám"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "E-mail cím"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Elérési út"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Lebegőpontos szám"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Nagy egész szám (8 bájtos)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 cím"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP cím"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Logikai (True, False vagy None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Pozitív egész"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Pozitív kis egész"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "URL-barát cím (%(max_length)s hosszig)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Kis egész"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Szöveg"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Idő"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Nyers bináris adat"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Fájl"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Kép"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Idegen kulcs (típusa a kapcsolódó mezőtől függ)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Egy-egy kapcsolat"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Több-több kapcsolat"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Ennek a mezőnek a megadása kötelező."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Adjon meg egy egész számot."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Adj meg egy számot."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -678,31 +716,31 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Adjon meg egy érvényes dátumot."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Adjon meg egy érvényes időt."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Adjon meg egy érvényes dátumot/időt."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Nem küldött el fájlt. Ellenőrizze a kódolás típusát az űrlapon."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Semmilyen fájl sem került feltöltésre."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "A küldött fájl üres."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -714,13 +752,13 @@
"Bizonyosodjon meg arról, hogy a fájlnév legfeljebb %(max)d karakterből áll "
"(jelenlegi hossza: %(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Küldjön egy új fájlt, vagy jelölje be a törlés négyzetet, de ne mindkettőt "
"egyszerre."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -728,22 +766,26 @@
"Töltsön fel egy érvényes képfájlt. A feltöltött fájl nem kép volt, vagy "
"megsérült."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Válasszon érvényes elemet. '%(value)s' nincs az elérhető lehetőségek között."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Adja meg értékek egy listáját."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(Rejtett mező: %(name)s) %(error)s"
@@ -751,42 +793,49 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Sorrend"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Törlés"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Javítsa a mezőhöz tartozó duplikált adatokat: %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Javítsa a mezőhöz tartozó duplikált adatokat: %(field)s (egyedinek kell "
"lenniük)."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -795,35 +844,35 @@
"Javítsa a mezőhöz tartozó duplikált adatokat: %(field_name)s (egyedinek kell "
"lenniük %(lookup)s alapján a dátum mezőn: %(date_field)s)."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Javítsa az alábbi duplikált értékeket."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"A beágyazott idegen kulcs nem egyezik meg a szülő példány elsődleges "
"kulcsával."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Válasszon érvényes elemet. Az Ön választása nincs az elérhető lehetőségek "
"között."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Tartsa lenyomva a \"Control\"-t (vagy Mac-en a \"Command\"-ot) több elem "
"kiválasztásához."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -832,15 +881,15 @@
"%(datetime)s értelmezhetetlen a megadott %(current_timezone)s időzónában; "
"vagy félreérthető, vagy nem létezik."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Jelenleg"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Módosítás"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Törlés"
@@ -856,63 +905,63 @@
msgid "No"
msgstr "Nem"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "igen,nem,talán"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bájt"
msgstr[1] "%(size)d bájt"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "du"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "de"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "DU"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "DE"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "éjfél"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "dél"
@@ -1188,117 +1237,133 @@
msgid "December"
msgstr "december"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "vagy"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d év"
msgstr[1] "%d év"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d hónap"
msgstr[1] "%d hónap"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d hét"
msgstr[1] "%d hét"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d nap"
msgstr[1] "%d nap"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d óra"
msgstr[1] "%d óra"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d perc"
msgstr[1] "%d perc"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 perc"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "A könyvtárak listázása itt nincs engedélyezve."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" nem létezik"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "A %(directory)s könyvtár tartalma"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Nincs év megadva"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Nincs hónap megadva"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Nincs nap megadva"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Nincs hét megadva"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Nincsenek elérhető %(verbose_name_plural)s"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1307,7 +1372,7 @@
"Jövőbeli %(verbose_name_plural)s nem elérhetők, mert %(class_name)s."
"allow_future értéke False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1318,16 +1383,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Nincs a keresési feltételeknek megfelelő %(verbose_name)s"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Az oldal nem 'last', vagy nem lehet egésszé alakítani."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Érvénytelen oldal (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Üres lista, és '%(class_name)s.allow_empty' értéke False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "A könyvtárak listázása itt nincs engedélyezve."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" nem létezik"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "A %(directory)s könyvtár tartalma"
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/ia/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ia/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/ia/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ia/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/ia/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ia/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -4,10 +4,10 @@
# Martijn Dekker , 2012
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
"language/ia/)\n"
@@ -26,6 +26,10 @@
msgstr "arabe"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "azeri"
@@ -78,321 +82,349 @@
msgstr "anglese"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "anglese britannic"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "espaniol"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "espaniol argentin"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "espaniol mexican"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "espaniol nicaraguan"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "estoniano"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "basco"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "persiano"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "finnese"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "francese"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "frison"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "irlandese"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "galiciano"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "hebreo"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "croato"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "hungaro"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "indonesiano"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "islandese"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "japonese"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "georgiano"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "kazakh"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "coreano"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "lituano"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "letton"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "macedone"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "malayalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "mongolico"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "norvegiano, bokmål"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "nepali"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "hollandese"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "norvegiano, nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "punjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "polonese"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "portugese"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "portugese brasilian"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "romaniano"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "russo"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "slovaco"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "sloveno"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "albanese"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "serbo"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "serbo latin"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "svedese"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "thailandese"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "tartaro"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ukrainiano"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "vietnamese"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "chinese simplificate"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "chinese traditional"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Specifica un valor valide."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Specifica un URL valide."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Specifica un denotation valide, consistente de litteras, numeros, tractos de "
"sublineamento o tractos de union."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Specifica un adresse IPv4 valide."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Specifica un adresse IPv6 valide."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Specifica un adresse IPv4 o IPv6 valide."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Scribe solmente digitos separate per commas."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Assecura te que iste valor es %(limit_value)s (illo es %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Assecura te que iste valor es inferior o equal a %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Assecura te que iste valor es superior o equal a %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -403,7 +435,7 @@
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -414,247 +446,255 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s debe esser unic pro %(lookup)s de %(date_field)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "e"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s con iste %(field_label)s jam existe."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Iste campo non pote esser nulle."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Iste campo non pote esser vacue."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s con iste %(field_label)s jam existe."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo de typo: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Numero integre"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Booleano (ver o false)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Catena (longitude maxime: %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Numeros integre separate per commas"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Data (sin hora)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Data (con hora)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Numero decimal"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Adresse de e-mail"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Cammino de file"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Numero a comma flottante"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Numero integre grande (8 bytes)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Adresse IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Adresse IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (ver, false o nulle)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Numero integre positive"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Parve numero integre positive"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Denotation (longitude maxime: %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Parve numero integre"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "File"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Imagine"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Clave estranier (typo determinate per le campo associate)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Relation un a un"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Relation multes a multes"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Iste campo es obligatori."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Specifica un numero integre."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Specifica un numero."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -663,33 +703,33 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Specifica un data valide."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Specifica un hora valide."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Specifica un data e hora valide."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Nulle file esseva submittite. Verifica le typo de codification in le "
"formulario."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Nulle file esseva submittite."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Le file submittite es vacue."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -697,11 +737,11 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Per favor o submitte un file o marca le quadrato \"rader\", non ambes."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -709,22 +749,26 @@
"Per favor incarga un imagine valide. Le file que tu incargava o non esseva "
"un imagine o esseva un imagine corrumpite."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Selige un option valide. %(value)s non es inter le optiones disponibile."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Scribe un lista de valores."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -732,41 +776,48 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ordine"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Deler"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Per favor corrige le datos duplicate pro %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Per favor corrige le datos duplicate pro %(field)s, que debe esser unic."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -775,33 +826,33 @@
"Per favor corrige le datos duplicate pro %(field_name)s, que debe esser unic "
"pro le %(lookup)s in %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Per favor corrige le sequente valores duplicate."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Le clave estranier incorporate non correspondeva al clave primari del "
"instantia genitor."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Per favor selige un option valide. Iste option non es inter le optiones "
"disponibile."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Tene premite \"Control\" o \"Command\" sur un Mac pro seliger plures."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -810,15 +861,15 @@
"%(datetime)s non poteva esser interpretate in le fuso horari "
"%(current_timezone)s; illo pote esser ambigue o illo pote non exister."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Actualmente"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Cambiar"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Rader"
@@ -834,63 +885,63 @@
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "si,no,forsan"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "pm."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "am."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "medienocte"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "mediedie"
@@ -1166,117 +1217,133 @@
msgid "December"
msgstr "Decembre"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Le indices de directorio non es permittite hic."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" non existe"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Indice de %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Nulle anno specificate"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Nulle mense specificate"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Nulle die specificate"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Nulle septimana specificate"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Il non ha %(verbose_name_plural)s disponibile"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1285,7 +1352,7 @@
"In le futuro, %(verbose_name_plural)s non essera disponibile perque "
"%(class_name)s.allow_future es False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Le data '%(datestr)s' es invalide secundo le formato '%(format)s'"
@@ -1295,16 +1362,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Nulle %(verbose_name)s trovate que corresponde al consulta"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Pagina non es 'last', ni pote esser convertite in un numero integre."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Le lista es vacue e '%(class_name)s.allow_empty' es False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Le indices de directorio non es permittite hic."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" non existe"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indice de %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/id/formats.py python-django-1.7.4/django/conf/locale/id/formats.py
--- python-django-1.6.6/django/conf/locale/id/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/id/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,7 +12,7 @@
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'd-m-Y'
SHORT_DATETIME_FORMAT = 'd-m-Y G.i.s'
-FIRST_DAY_OF_WEEK = 1 #Monday
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/id/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/id/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/id/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/id/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/id/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/id/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -3,13 +3,14 @@
# Translators:
# Jannis Leidel , 2011
# rodin , 2011
+# rodin , 2013-2014
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
-"Last-Translator: Jannis Leidel \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-09-08 12:38+0000\n"
+"Last-Translator: rodin \n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
"language/id/)\n"
"MIME-Version: 1.0\n"
@@ -20,13 +21,17 @@
#: conf/global_settings.py:51
msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
#: conf/global_settings.py:52
msgid "Arabic"
msgstr "Arab"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr "Asturia"
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Azerbaijani"
@@ -36,7 +41,7 @@
#: conf/global_settings.py:55
msgid "Belarusian"
-msgstr ""
+msgstr "Belarusia"
#: conf/global_settings.py:56
msgid "Bengali"
@@ -44,7 +49,7 @@
#: conf/global_settings.py:57
msgid "Breton"
-msgstr ""
+msgstr "Breton"
#: conf/global_settings.py:58
msgid "Bosnian"
@@ -79,320 +84,348 @@
msgstr "Inggris"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Inggris Britania"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Spanyol"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Spanyol Argentina"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Spanyol Meksiko"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Spanyol Nikaragua"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
-msgstr ""
+msgstr "Spanyol Venezuela"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Estonia"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Basque"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persia"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finlandia"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Perancis"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frisia"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Irlandia"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galicia"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Ibrani"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Kroasia"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Hungaria"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
-msgstr ""
+msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indonesia"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Islandia"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Italia"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Jepang"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Georgia"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "Kazakhstan"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Korea"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
-msgstr ""
+msgstr "Luxemburg"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Lithuania"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Latvia"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Makedonia"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongolia"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr "Burma"
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Norwegia Bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepal"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Belanda"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Norwegia Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
-msgstr ""
+msgstr "Ossetic"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Polandia"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portugis"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Portugis Brazil"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Romania"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Rusia"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slovakia"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Slovenia"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albania"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbia"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serbia Latin"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Swedia"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Thailand"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Turki"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatar"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
-msgstr ""
+msgstr "Udmurt"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Ukrainia"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Vietnam"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
-msgstr "Cina Sederhana"
+msgstr "Tiongkok Sederhana"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
-msgstr "Cina Tradisionil"
+msgstr "Tiongkok Tradisionil"
+
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Masukkan nilai yang valid."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Masukkan URL yang valid."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Masukkan alamat email yang valid."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Masukkan 'slug' yang terdiri dari huruf, bilangan, garis bawah, atau tanda "
"minus."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Masukkan alamat IPv4 yang valid."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Masukkan alamat IPv6 yang valid"
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Masukkan alamat IPv4 atau IPv6 yang valid"
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Hanya masukkan angka yang dipisahkan dengan koma."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Pastikan nilai ini %(limit_value)s (saat ini %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Pastikan nilai ini lebih kecil dari atau sama dengan %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Pastikan nilai ini lebih besar dari atau sama dengan %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -401,8 +434,10 @@
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Pastikan nilai ini mengandung paling sedikit %(limit_value)d karakter "
+"(sekarang %(show_value)d karakter)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -411,291 +446,305 @@
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr[0] ""
+"Pastikan nilai ini mengandung paling banyak %(limit_value)d karakter "
+"(sekarang %(show_value)d karakter)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s harus unik untuk %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "dan"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s dengan %(field_label)s telah ada."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Field ini tidak boleh null."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Field ini tidak boleh kosong."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s dengan %(field_label)s telah ada."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Field dengan tipe: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Bilangan Asli"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Nilai Boolean (Salah satu dari True atau False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (maksimum %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Bilangan asli yang dipisahkan dengan koma"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Tanggal (tanpa waktu)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Tanggal (dengan waktu)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Bilangan desimal"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Alamat email"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Lokasi berkas"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Bilangan 'floating point'"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Bilangan asli raksasa (8 byte)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Alamat IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Alamat IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (Salah satu dari True, False, atau None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Bilangan asli positif"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Bilangan asli kecil positif"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (hingga %(max_length)s karakter)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Bilangan asli kecil"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Teks"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Waktu"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
-msgstr ""
+msgstr "Data biner mentah"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Berkas"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Gambar"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Kunci Asing (tipe tergantung dari bidang yang berkaitan)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Hubungan satu-ke-satu"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Hubungan banyak-ke-banyak"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Bidang ini tidak boleh kosong."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Masukkan keseluruhan angka bilangan."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Masukkan sebuah bilangan."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
+msgstr[0] "Pastikan jumlah angka pada bilangan tidak melebihi %(max)s angka."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
+msgstr[0] "Pastikan bilangan tidak memiliki lebih dari %(max)s angka desimal."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
msgid_plural ""
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] ""
+"Pastikan jumlah angka sebelum desimal pada bilangan tidak memiliki lebih "
+"dari %(max)s angka."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Masukkan tanggal yang valid."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Masukkan waktu yang valid."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Masukkan tanggal/waktu yang valid."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Tidak ada berkas yang dikirimkan. Periksa tipe pengaksaraan formulir."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Tidak ada berkas yang dikirimkan."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Berkas yang dikirimkan kosong."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr[0] ""
+"Pastikan nama berkas ini mengandung paling banyak %(max)d karakter (sekarang "
+"%(length)d karakter)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Pilih antara mengirimkan berkas atau menghapus tanda centang pada kotak "
"centang"
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -703,63 +752,73 @@
"Unggah gambar yang valid. Berkas yang Anda unggah bukan merupakan berkas "
"gambar atau gambarnya rusak."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Masukkan pilihan yang valid. %(value)s bukan salah satu dari pilihan yang "
"tersedia."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Masukkan beberapa nilai."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
-msgstr ""
+msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
+msgstr "(Bidang tersembunyi %(name)s) %(error)s"
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
-msgstr ""
+msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
+msgstr[0] "Pastikan mengirim %d formulir atau lebih sedikit. "
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
msgstr[0] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Urutan"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Hapus"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Perbaiki data ganda untuk %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Perbaiki data ganda untuk %(field)s yang nilainya harus unik."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -768,33 +827,33 @@
"Perbaiki data ganda untuk %(field_name)s yang nilainya harus unik untuk "
"pencarian %(lookup)s pada %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Perbaiki nilai ganda di bawah ini."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Kunci asing 'inline' tidak cocok dengan kunci utama 'instance' milik induk."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Masukkan pilihan yang valid. Pilihan tersebut bukan salah satu dari pilihan "
"yang tersedia."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%(pk)s\" bukan nilai yang benar untuk kunci utama."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Tekan \"Control\", atau \"Command\" pada Mac untuk memilih lebih dari satu."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -803,15 +862,15 @@
"%(datetime)s tidak dapat diinterpretasikan pada zona waktu "
"%(current_timezone)s; mungkin nilainya ambigu atau mungkin tidak ada."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Saat ini"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Ubah"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Hapus"
@@ -827,62 +886,62 @@
msgid "No"
msgstr "Tidak"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "ya,tidak,mungkin"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bita"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "tengah malam"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "siang"
@@ -1158,111 +1217,127 @@
msgid "December"
msgstr "Desember"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "atau"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
-msgstr[0] ""
+msgstr[0] "%d tahun"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
-msgstr[0] ""
+msgstr[0] "%d bulan"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
-msgstr[0] ""
+msgstr[0] "%d minggu"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
-msgstr[0] ""
+msgstr[0] "%d hari"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
+msgstr[0] "%d jam"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
+msgstr[0] "%d menit"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
+msgstr "0 menit"
+
+#: views/csrf.py:105
+msgid "Forbidden"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Indeks direktori tidak diizinkan di sini."
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" tidak ada"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Daftar isi %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Tidak ada tahun dipilih"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Tidak ada bulan dipilih"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Tidak ada hari dipilih"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Tidak ada minggu dipilih"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Tidak ada %(verbose_name_plural)s tersedia"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1271,7 +1346,7 @@
"%(verbose_name_plural)s di masa depan tidak tersedia karena %(class_name)s."
"allow_future bernilai False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Teks tanggal tidak valid '%(datestr)s' dalam format '%(format)s'"
@@ -1281,18 +1356,32 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Tidak ada %(verbose_name)s yang cocok dengan kueri"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Laman bukan yang 'terakhir' atau juga tidak dapat dikonversikan ke bilangan "
"bulat."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr ""
+msgstr "Laman tidak valid (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Daftar kosong dan '%(class_name)s.allow_empty' bernilai False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Indeks direktori tidak diizinkan di sini."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" tidak ada"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Daftar isi %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/__init__.py python-django-1.7.4/django/conf/locale/__init__.py
--- python-django-1.6.6/django/conf/locale/__init__.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/__init__.py 2015-01-27 17:12:29.000000000 +0000
@@ -17,6 +17,12 @@
'name': 'Arabic',
'name_local': 'العربيّة',
},
+ 'ast': {
+ 'bidi': False,
+ 'code': 'ast',
+ 'name': 'Asturian',
+ 'name_local': 'asturianu',
+ },
'az': {
'bidi': True,
'code': 'az',
@@ -95,6 +101,12 @@
'name': 'English',
'name_local': 'English',
},
+ 'en-au': {
+ 'bidi': False,
+ 'code': 'en-au',
+ 'name': 'Australian English',
+ 'name_local': 'Australian English',
+ },
'en-gb': {
'bidi': False,
'code': 'en-gb',
@@ -167,11 +179,11 @@
'name': 'French',
'name_local': 'français',
},
- 'fy-nl': {
+ 'fy': {
'bidi': False,
- 'code': 'fy-nl',
+ 'code': 'fy',
'name': 'Frisian',
- 'name_local': 'Frisian',
+ 'name_local': 'frysk',
},
'ga': {
'bidi': False,
@@ -215,6 +227,12 @@
'name': 'Interlingua',
'name_local': 'Interlingua',
},
+ 'io': {
+ 'bidi': False,
+ 'code': 'io',
+ 'name': 'Ido',
+ 'name_local': 'ido',
+ },
'id': {
'bidi': False,
'code': 'id',
@@ -305,6 +323,12 @@
'name': 'Mongolian',
'name_local': 'Mongolian',
},
+ 'mr': {
+ 'bidi': False,
+ 'code': 'mr',
+ 'name': 'Marathi',
+ 'name_local': 'मराठी',
+ },
'my': {
'bidi': False,
'code': 'my',
@@ -485,6 +509,18 @@
'name': 'Simplified Chinese',
'name_local': '简体中文',
},
+ 'zh-hans': {
+ 'bidi': False,
+ 'code': 'zh-hans',
+ 'name': 'Simplified Chinese',
+ 'name_local': '简体中文',
+ },
+ 'zh-hant': {
+ 'bidi': False,
+ 'code': 'zh-hant',
+ 'name': 'Traditional Chinese',
+ 'name_local': '繁體中文',
+ },
'zh-tw': {
'bidi': False,
'code': 'zh-tw',
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/io/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/io/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/io/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/io/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/io/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/io/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -0,0 +1,1398 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Viko Bartero , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
+"Language-Team: Ido (http://www.transifex.com/projects/p/django/language/"
+"io/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: io\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: conf/global_settings.py:51
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: conf/global_settings.py:52
+msgid "Arabic"
+msgstr "العربية"
+
+#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Azerbaijani"
+msgstr "Azərbaycanca"
+
+#: conf/global_settings.py:54
+msgid "Bulgarian"
+msgstr "български"
+
+#: conf/global_settings.py:55
+msgid "Belarusian"
+msgstr "беларуская"
+
+#: conf/global_settings.py:56
+msgid "Bengali"
+msgstr "বাংলা"
+
+#: conf/global_settings.py:57
+msgid "Breton"
+msgstr "Brezhoneg"
+
+#: conf/global_settings.py:58
+msgid "Bosnian"
+msgstr "босански"
+
+#: conf/global_settings.py:59
+msgid "Catalan"
+msgstr "Català"
+
+#: conf/global_settings.py:60
+msgid "Czech"
+msgstr "čeština"
+
+#: conf/global_settings.py:61
+msgid "Welsh"
+msgstr "Cymraeg"
+
+#: conf/global_settings.py:62
+msgid "Danish"
+msgstr "dansk"
+
+#: conf/global_settings.py:63
+msgid "German"
+msgstr "Deutsch"
+
+#: conf/global_settings.py:64
+msgid "Greek"
+msgstr "Ελληνικά"
+
+#: conf/global_settings.py:65
+msgid "English"
+msgstr "English"
+
+#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
+msgid "British English"
+msgstr "British English"
+
+#: conf/global_settings.py:68
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: conf/global_settings.py:69
+msgid "Spanish"
+msgstr "Español"
+
+#: conf/global_settings.py:70
+msgid "Argentinian Spanish"
+msgstr "Español de Argentina"
+
+#: conf/global_settings.py:71
+msgid "Mexican Spanish"
+msgstr "Español de México"
+
+#: conf/global_settings.py:72
+msgid "Nicaraguan Spanish"
+msgstr "Español de Nicaragua"
+
+#: conf/global_settings.py:73
+msgid "Venezuelan Spanish"
+msgstr "Español de Venezuela"
+
+#: conf/global_settings.py:74
+msgid "Estonian"
+msgstr "Eesti"
+
+#: conf/global_settings.py:75
+msgid "Basque"
+msgstr "Euskara"
+
+#: conf/global_settings.py:76
+msgid "Persian"
+msgstr "فارسی"
+
+#: conf/global_settings.py:77
+msgid "Finnish"
+msgstr "Suomi"
+
+#: conf/global_settings.py:78
+msgid "French"
+msgstr "Français"
+
+#: conf/global_settings.py:79
+msgid "Frisian"
+msgstr "Frysk"
+
+#: conf/global_settings.py:80
+msgid "Irish"
+msgstr "Gaeilge"
+
+#: conf/global_settings.py:81
+msgid "Galician"
+msgstr "Galego"
+
+#: conf/global_settings.py:82
+msgid "Hebrew"
+msgstr "עברית"
+
+#: conf/global_settings.py:83
+msgid "Hindi"
+msgstr "हिन्दी"
+
+#: conf/global_settings.py:84
+msgid "Croatian"
+msgstr "hrvatski"
+
+#: conf/global_settings.py:85
+msgid "Hungarian"
+msgstr "Magyar"
+
+#: conf/global_settings.py:86
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:87
+msgid "Indonesian"
+msgstr "Bahasa Indonesia"
+
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
+msgid "Icelandic"
+msgstr "Íslenska"
+
+#: conf/global_settings.py:89
+msgid "Italian"
+msgstr "Italiano"
+
+#: conf/global_settings.py:90
+msgid "Japanese"
+msgstr "日本語"
+
+#: conf/global_settings.py:91
+msgid "Georgian"
+msgstr "ქართული"
+
+#: conf/global_settings.py:92
+msgid "Kazakh"
+msgstr "Қазақша"
+
+#: conf/global_settings.py:93
+msgid "Khmer"
+msgstr "Khmer"
+
+#: conf/global_settings.py:94
+msgid "Kannada"
+msgstr "Kannaḍa"
+
+#: conf/global_settings.py:95
+msgid "Korean"
+msgstr "한국어"
+
+#: conf/global_settings.py:96
+msgid "Luxembourgish"
+msgstr "Lëtzebuergesch"
+
+#: conf/global_settings.py:97
+msgid "Lithuanian"
+msgstr "Lietuvių"
+
+#: conf/global_settings.py:98
+msgid "Latvian"
+msgstr "Latviešu"
+
+#: conf/global_settings.py:99
+msgid "Macedonian"
+msgstr "Македонски"
+
+#: conf/global_settings.py:100
+msgid "Malayalam"
+msgstr "മലയാളം"
+
+#: conf/global_settings.py:101
+msgid "Mongolian"
+msgstr "Монгол"
+
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr "Burmese"
+
+#: conf/global_settings.py:103
+msgid "Norwegian Bokmal"
+msgstr "Norsk bokmål"
+
+#: conf/global_settings.py:104
+msgid "Nepali"
+msgstr "नेपाली"
+
+#: conf/global_settings.py:105
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: conf/global_settings.py:106
+msgid "Norwegian Nynorsk"
+msgstr "Norsk nynorsk"
+
+#: conf/global_settings.py:107
+msgid "Ossetic"
+msgstr "Ossetic"
+
+#: conf/global_settings.py:108
+msgid "Punjabi"
+msgstr "ਪੰਜਾਬੀ"
+
+#: conf/global_settings.py:109
+msgid "Polish"
+msgstr "Polski"
+
+#: conf/global_settings.py:110
+msgid "Portuguese"
+msgstr "Português"
+
+#: conf/global_settings.py:111
+msgid "Brazilian Portuguese"
+msgstr "Português do Brasil"
+
+#: conf/global_settings.py:112
+msgid "Romanian"
+msgstr "Română"
+
+#: conf/global_settings.py:113
+msgid "Russian"
+msgstr "Русский"
+
+#: conf/global_settings.py:114
+msgid "Slovak"
+msgstr "Slovenčina"
+
+#: conf/global_settings.py:115
+msgid "Slovenian"
+msgstr "Slovenščina"
+
+#: conf/global_settings.py:116
+msgid "Albanian"
+msgstr "Shqip"
+
+#: conf/global_settings.py:117
+msgid "Serbian"
+msgstr "Српски / srpski"
+
+#: conf/global_settings.py:118
+msgid "Serbian Latin"
+msgstr "Serbian Latin"
+
+#: conf/global_settings.py:119
+msgid "Swedish"
+msgstr "Svenska"
+
+#: conf/global_settings.py:120
+msgid "Swahili"
+msgstr "Kiswahili"
+
+#: conf/global_settings.py:121
+msgid "Tamil"
+msgstr "தமிழ்"
+
+#: conf/global_settings.py:122
+msgid "Telugu"
+msgstr "Telugu"
+
+#: conf/global_settings.py:123
+msgid "Thai"
+msgstr "ไทย"
+
+#: conf/global_settings.py:124
+msgid "Turkish"
+msgstr "Türkçe"
+
+#: conf/global_settings.py:125
+msgid "Tatar"
+msgstr "Tatar"
+
+#: conf/global_settings.py:126
+msgid "Udmurt"
+msgstr "Удмурт"
+
+#: conf/global_settings.py:127
+msgid "Ukrainian"
+msgstr "Українська"
+
+#: conf/global_settings.py:128
+msgid "Urdu"
+msgstr "اُردُو"
+
+#: conf/global_settings.py:129
+msgid "Vietnamese"
+msgstr "Tiếng Việt"
+
+#: conf/global_settings.py:130 conf/global_settings.py:131
+msgid "Simplified Chinese"
+msgstr "简体中文"
+
+#: conf/global_settings.py:132 conf/global_settings.py:133
+msgid "Traditional Chinese"
+msgstr "繁體中文"
+
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
+#: core/validators.py:21
+msgid "Enter a valid value."
+msgstr "Skribez valida datumo."
+
+#: core/validators.py:77 forms/fields.py:675
+msgid "Enter a valid URL."
+msgstr "Skribez valida URL."
+
+#: core/validators.py:115
+msgid "Enter a valid integer."
+msgstr ""
+
+#: core/validators.py:120
+msgid "Enter a valid email address."
+msgstr "Skribez valida e-posto adreso."
+
+#: core/validators.py:185
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Skribez valida \"slug\" kompozata de literi, numeri, juntostreki o "
+"subjuntostreki."
+
+#: core/validators.py:188 core/validators.py:207
+msgid "Enter a valid IPv4 address."
+msgstr "Skribez valida IPv4 adreso."
+
+#: core/validators.py:193 core/validators.py:208
+msgid "Enter a valid IPv6 address."
+msgstr "Skribez valida IPv6 adreso."
+
+#: core/validators.py:203 core/validators.py:206
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Skribez valida adreso IPv4 od IPv6."
+
+#: core/validators.py:229 db/models/fields/__init__.py:1070
+msgid "Enter only digits separated by commas."
+msgstr "Skribez nur cifri separata per komi."
+
+#: core/validators.py:236
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+"Verifikez ke ica datumo esas %(limit_value)s (olu esas %(show_value)s)."
+
+#: core/validators.py:255
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr "Verifikez ke ica datumo esas minora kam od egala a %(limit_value)s."
+
+#: core/validators.py:262
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr "Verifikez ke ica datumo esas majora kam od egala a %(limit_value)s."
+
+#: core/validators.py:271
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+"Verifikez ke ica datumo havas %(limit_value)d litero adminime (olu havas "
+"%(show_value)d)."
+msgstr[1] ""
+"Verifikez ke ica datumo havas %(limit_value)d literi adminime (olu havas "
+"%(show_value)d)."
+
+#: core/validators.py:282
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+"Verifikez ke ica datumo havas %(limit_value)d litero admaxime (olu havas "
+"%(show_value)d)."
+msgstr[1] ""
+"Verifikez ke ica datumo havas %(limit_value)d literi admaxime (olu havas "
+"%(show_value)d)."
+
+#: db/models/base.py:975 forms/models.py:718
+msgid "and"
+msgstr "e"
+
+#: db/models/base.py:977
+#, python-format
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
+
+#: db/models/fields/__init__.py:104
+#, python-format
+msgid "Value %(value)r is not a valid choice."
+msgstr ""
+
+#: db/models/fields/__init__.py:105
+msgid "This field cannot be null."
+msgstr "Ica feldo ne povas esar nula."
+
+#: db/models/fields/__init__.py:106
+msgid "This field cannot be blank."
+msgstr "Ica feldo ne povas esar vakua."
+
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "La %(model_name)s kun ica %(field_label)s ja existas."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Feldo de tipo: %(field_type)s"
+
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
+msgid "Integer"
+msgstr "Integro"
+
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: db/models/fields/__init__.py:926
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:928
+msgid "Boolean (Either True or False)"
+msgstr "Booleano (True o False)"
+
+#: db/models/fields/__init__.py:1004
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "String (til %(max_length)s)"
+
+#: db/models/fields/__init__.py:1065
+msgid "Comma-separated integers"
+msgstr "Integri separata per komi"
+
+#: db/models/fields/__init__.py:1080
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: db/models/fields/__init__.py:1085
+msgid "Date (without time)"
+msgstr "Dato (sen horo)"
+
+#: db/models/fields/__init__.py:1187
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1191
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1195
+msgid "Date (with time)"
+msgstr "Dato (kun horo)"
+
+#: db/models/fields/__init__.py:1297
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: db/models/fields/__init__.py:1299
+msgid "Decimal number"
+msgstr "Decimala numero"
+
+#: db/models/fields/__init__.py:1444
+msgid "Email address"
+msgstr "E-postala adreso"
+
+#: db/models/fields/__init__.py:1470
+msgid "File path"
+msgstr "Arkivo voyo"
+
+#: db/models/fields/__init__.py:1537
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: db/models/fields/__init__.py:1539
+msgid "Floating point number"
+msgstr "Glitkomo numero"
+
+#: db/models/fields/__init__.py:1623
+msgid "Big (8 byte) integer"
+msgstr "Granda (8 byte) integro"
+
+#: db/models/fields/__init__.py:1638
+msgid "IPv4 address"
+msgstr "IPv4 adreso"
+
+#: db/models/fields/__init__.py:1668
+msgid "IP address"
+msgstr "IP adreso"
+
+#: db/models/fields/__init__.py:1747
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:1749
+msgid "Boolean (Either True, False or None)"
+msgstr "Booleano (True, False o None)"
+
+#: db/models/fields/__init__.py:1809
+msgid "Positive integer"
+msgstr "Positiva integro"
+
+#: db/models/fields/__init__.py:1821
+msgid "Positive small integer"
+msgstr "Positiva mikra integro"
+
+#: db/models/fields/__init__.py:1834
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (til %(max_length)s)"
+
+#: db/models/fields/__init__.py:1863
+msgid "Small integer"
+msgstr "Mikra integro"
+
+#: db/models/fields/__init__.py:1870
+msgid "Text"
+msgstr "Texto"
+
+#: db/models/fields/__init__.py:1893
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1895
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1898
+msgid "Time"
+msgstr "Horo"
+
+#: db/models/fields/__init__.py:1977
+msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/__init__.py:2000
+msgid "Raw binary data"
+msgstr "Kruda binara datumo"
+
+#: db/models/fields/files.py:225
+msgid "File"
+msgstr "Arkivo"
+
+#: db/models/fields/files.py:375
+msgid "Image"
+msgstr "Imajo"
+
+#: db/models/fields/related.py:1580
+#, python-format
+msgid "%(model)s instance with pk %(pk)r does not exist."
+msgstr ""
+
+#: db/models/fields/related.py:1582
+msgid "Foreign Key (type determined by related field)"
+msgstr "Exterklefo (la tipo esas determinata per la relatata feldo)"
+
+#: db/models/fields/related.py:1773
+msgid "One-to-one relationship"
+msgstr "Un-ad-un parenteso"
+
+#: db/models/fields/related.py:1843
+msgid "Many-to-many relationship"
+msgstr "Multi-a-multi parenteso"
+
+#: forms/fields.py:55
+msgid "This field is required."
+msgstr "Ica feldo esas obligata."
+
+#: forms/fields.py:236
+msgid "Enter a whole number."
+msgstr "Skribez kompleta numero"
+
+#: forms/fields.py:279 forms/fields.py:316
+msgid "Enter a number."
+msgstr "Skribez numero."
+
+#: forms/fields.py:318
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/fields.py:322
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/fields.py:326
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/fields.py:437 forms/fields.py:1139
+msgid "Enter a valid date."
+msgstr "Skribez valida dato."
+
+#: forms/fields.py:461 forms/fields.py:1140
+msgid "Enter a valid time."
+msgstr "Skribez valida horo."
+
+#: forms/fields.py:483
+msgid "Enter a valid date/time."
+msgstr "Skribez valida dato/horo."
+
+#: forms/fields.py:564
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "Nula arkivo sendesis. Verifikez la kodexigo tipo en la formulario."
+
+#: forms/fields.py:565
+msgid "No file was submitted."
+msgstr "Nula arkivo sendesis."
+
+#: forms/fields.py:566
+msgid "The submitted file is empty."
+msgstr "La sendita arkivo esas vakua."
+
+#: forms/fields.py:568
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+"Verifikez ke ica dosiero nomo havas %(max)d skribsigno admaxime (olu havas "
+"%(length)d)."
+msgstr[1] ""
+"Verifikez ke ica arkivo nomo havas %(max)d skribsigni admaxime (olu havas "
+"%(length)d)."
+
+#: forms/fields.py:571
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr "Sendez arkivo o markizez la vakua markbuxo, ne la du."
+
+#: forms/fields.py:632
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Kargez valida imajo. La arkivo qua vu kargis ne esis imajo od esis defektiva."
+
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+"Selektez valida selekto. %(value)s ne esas un de la disponebla selekti."
+
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
+msgid "Enter a list of values."
+msgstr "Skribez listo de datumi."
+
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
+#. Translators: This is the default suffix added to form field labels
+#: forms/forms.py:122
+msgid ":"
+msgstr ""
+
+#: forms/forms.py:192
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr "(Okulta feldo %(name)s) %(error)s"
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the
+#. label
+#: forms/forms.py:620
+msgid ":?.!"
+msgstr ""
+
+#: forms/formsets.py:95
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: forms/formsets.py:332
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
+msgid "Order"
+msgstr "Ordinar"
+
+#: forms/formsets.py:371
+msgid "Delete"
+msgstr "Eliminar"
+
+#: forms/models.py:712
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Koretigez duopligata datumi por %(field)s."
+
+#: forms/models.py:716
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr "Korektigez la duopligata datumi por %(field)s, qui mustas esar unika."
+
+#: forms/models.py:722
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"Korektigez la duopligata datumi por %(field_name)s qui mustas esar unika por "
+"la %(lookup)s en %(date_field)s."
+
+#: forms/models.py:730
+msgid "Please correct the duplicate values below."
+msgstr "Korektigez la duopligata datumi infre."
+
+#: forms/models.py:1028
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+"La interna exterklefo ne koincidis kun la prima klefo dil patro instanco."
+
+#: forms/models.py:1094
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Selektez valida selekto. Ita selekto ne esas un de la disponebla selekti."
+
+#: forms/models.py:1194
+#, python-format
+msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgstr ""
+
+#: forms/models.py:1205
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Mantenez pulsata \"Control\" o \"Command\" en Mac por selektar pluse kam un."
+
+#: forms/utils.py:148
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"La %(datetime)s ne povis esar interpretata en la horala zono "
+"%(current_timezone)s; forsan, olu esas ambigua o ne existas."
+
+#: forms/widgets.py:350
+msgid "Currently"
+msgstr "Aktuale"
+
+#: forms/widgets.py:351
+msgid "Change"
+msgstr "Modifikar"
+
+#: forms/widgets.py:352
+msgid "Clear"
+msgstr "Vakuigar"
+
+#: forms/widgets.py:546
+msgid "Unknown"
+msgstr "Nekonocata"
+
+#: forms/widgets.py:547
+msgid "Yes"
+msgstr "Yes"
+
+#: forms/widgets.py:548
+msgid "No"
+msgstr "No"
+
+#: template/defaultfilters.py:855
+msgid "yes,no,maybe"
+msgstr "yes,no,forsan"
+
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
+
+#: template/defaultfilters.py:898
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: template/defaultfilters.py:900
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#: template/defaultfilters.py:902
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#: template/defaultfilters.py:904
+#, python-format
+msgid "%s TB"
+msgstr "%s TB"
+
+#: template/defaultfilters.py:906
+#, python-format
+msgid "%s PB"
+msgstr "%s PB"
+
+#: utils/dateformat.py:59
+msgid "p.m."
+msgstr "p.m."
+
+#: utils/dateformat.py:60
+msgid "a.m."
+msgstr "a.m."
+
+#: utils/dateformat.py:65
+msgid "PM"
+msgstr "PM"
+
+#: utils/dateformat.py:66
+msgid "AM"
+msgstr "AM"
+
+#: utils/dateformat.py:149
+msgid "midnight"
+msgstr "noktomezo"
+
+#: utils/dateformat.py:151
+msgid "noon"
+msgstr "dimezo"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Lundio"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Mardio"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Merkurdio"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Jovdio"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Venerdio"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Saturdio"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Sundio"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "Lun"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "Mar"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "Mer"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "Jov"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "Ven"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "Sat"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "Sun"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "Januaro"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "Februaro"
+
+#: utils/dates.py:18
+msgid "March"
+msgstr "Marto"
+
+#: utils/dates.py:18
+msgid "April"
+msgstr "Aprilo"
+
+#: utils/dates.py:18
+msgid "May"
+msgstr "Mayo"
+
+#: utils/dates.py:18
+msgid "June"
+msgstr "Junio"
+
+#: utils/dates.py:19
+msgid "July"
+msgstr "Julio"
+
+#: utils/dates.py:19
+msgid "August"
+msgstr "Agosto"
+
+#: utils/dates.py:19
+msgid "September"
+msgstr "Septembro"
+
+#: utils/dates.py:19
+msgid "October"
+msgstr "Oktobro"
+
+#: utils/dates.py:19
+msgid "November"
+msgstr "Novembro"
+
+#: utils/dates.py:20
+msgid "December"
+msgstr "Decembro"
+
+#: 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 "may"
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr "jun"
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr "jul"
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr "ago"
+
+#: 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
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr "Jan."
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr "Feb."
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "Marto"
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "Aprilo"
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "Mayo"
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "Junio"
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "Julio"
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr "Ago."
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr "Sept."
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr "Okt."
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "Nov."
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "Dec."
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr "Januaro"
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr "Februaro"
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr "Marto"
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr "Aprilo"
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr "Mayo"
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr "Junio"
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr "Julio"
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr "Agosto"
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr "Septembro"
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr "Oktobro"
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr "Novembro"
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr "Decembro"
+
+#: utils/ipv6.py:10
+msgid "This is not a valid IPv6 address."
+msgstr ""
+
+#: utils/text.py:76
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:245
+msgid "or"
+msgstr "o"
+
+#. Translators: This string is used as a separator between list elements
+#: utils/text.py:264 utils/timesince.py:57
+msgid ", "
+msgstr ", "
+
+#: utils/timesince.py:25
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d yaro"
+msgstr[1] "%d yari"
+
+#: utils/timesince.py:26
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d monato"
+msgstr[1] "%d monati"
+
+#: utils/timesince.py:27
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d semano"
+msgstr[1] "%d semani"
+
+#: utils/timesince.py:28
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dio"
+msgstr[1] "%d dii"
+
+#: utils/timesince.py:29
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d horo"
+msgstr[1] "%d hori"
+
+#: utils/timesince.py:30
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minuti"
+
+#: utils/timesince.py:46
+msgid "0 minutes"
+msgstr "0 minuti"
+
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
+
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
+msgid "No year specified"
+msgstr "La yaro ne specizigesis"
+
+#: views/generic/dates.py:99
+msgid "No month specified"
+msgstr "La monato ne specizigesis"
+
+#: views/generic/dates.py:158
+msgid "No day specified"
+msgstr "La dio ne specizigesis"
+
+#: views/generic/dates.py:214
+msgid "No week specified"
+msgstr "La semano ne specizigesis"
+
+#: views/generic/dates.py:369 views/generic/dates.py:397
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Ne esas %(verbose_name_plural)s disponebla"
+
+#: views/generic/dates.py:650
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+"La futura %(verbose_name_plural)s ne esas disponebla pro ke %(class_name)s."
+"allow_future esas False."
+
+#: views/generic/dates.py:682
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: views/generic/list.py:62
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:67
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: views/generic/list.py:158
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Onu ne permisas direktorio indexi hike."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ne existas"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indexi di %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/is/formats.py python-django-1.7.4/django/conf/locale/is/formats.py
--- python-django-1.6.6/django/conf/locale/is/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/is/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -7,18 +7,18 @@
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'j. F Y'
TIME_FORMAT = 'H:i:s'
-# DATETIME_FORMAT =
+# DATETIME_FORMAT =
YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j. F'
SHORT_DATE_FORMAT = 'j.n.Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/is/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/is/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/is/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/is/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/is/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/is/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -8,11 +8,11 @@
# saevarom , 2013
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-09-05 10:10+0000\n"
-"Last-Translator: saevarom \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
"language/is/)\n"
"MIME-Version: 1.0\n"
@@ -30,6 +30,10 @@
msgstr "Arabíska"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Aserbaídsjíska"
@@ -82,323 +86,351 @@
msgstr "Enska"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Bresk enska"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Spænska"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Argentínsk spænska"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Mexíkósk Spænska"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Níkaragva spænska"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Eistland"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Baskneska"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Persneska"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Finnska"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Franska"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Frísneska"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Írska"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Galíska"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Hebreska"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Hindí"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Króatíska"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Ungverska"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Indónesíska"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Íslenska"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Ítalska"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Japanska"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Georgíska"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Kmeríska"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Kannadanska"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Kóreska"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Litháenska"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Lettneska"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Makedónska"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Malajalamska"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Mongólska"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Norska bókmál"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Hollenska"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Nýnorska"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Púndjabíska"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Pólska"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Portúgalska"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Brasilísk Portúgalska"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Rúmenska"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Rússneska"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Slóvaska"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Slóvenska"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Albanska"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Serbneska"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Serbnesk latína"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Sænska"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr ""
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Tamílska"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Telúgúska"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Tælenska"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Tyrkneska"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr ""
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Úkraínska"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Úrdú"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Víetnamska"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Einfölduð kínverska "
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Hefðbundin kínverska"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Sláðu inn gilt gildi."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Sláðu inn gilt veffang (URL)."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr "Sláðu inn gilda heiltölu."
+msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Sláðu inn gilt netfang."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Settu inn gildan vefslóðartitil sem samanstendur af latneskum bókstöfum, "
"númerin, undirstrikum og bandstrikum."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Sláðu inn gilda IPv4 tölu."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Sláðu inn gilt IPv6 vistfang."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Sláðu inn gilt IPv4 eða IPv6 vistfang."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Skrifaðu einungis tölur aðskildar með kommum."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Gakktu úr skugga um að gildi sé %(limit_value)s (það er %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Gakktu úr skugga um að gildið sé minna en eða jafnt og %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Gakktu úr skugga um að gildið sé stærra en eða jafnt og %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -413,7 +445,7 @@
"Gildið má mest vera %(limit_value)d stafir að lengd (það er %(show_value)d "
"nú)"
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -424,258 +456,255 @@
msgstr[0] ""
msgstr[1] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"%(field_name)s verður að vera einkvæmt fyrir %(date_field)s %(lookup)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "og"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s með þetta %(field_label)s er nú þegar til."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
-msgstr "Gildið %(value)r er ógilt."
+msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Þessi reitur getur ekki haft tómgildi (null)."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Þessi reitur má ekki vera tómur."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s með þetta %(field_label)s er nú þegar til."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Reitur af gerð: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Heiltala"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
-msgstr "Gildi '%(value)s' verður að vera heiltala."
+msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
-msgstr "'%(value)s' verður að vera annaðhvort satt eða ósatt."
+msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boole-gildi (True eða False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Strengur (mest %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Heiltölur aðgreindar með kommum"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-"'%(value)s' er ógilt dagsetningarsnið. Það verður að vera á sniðinu YYYY-MM-"
-"DD."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
-msgstr "'%(value)s' hefur rétt snið (YYYY-MM-DD) en dagsetningin er ógild."
+msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Dagsetning (án tíma)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-"'%(value)s' hefur ógilt snið. Það verður að vera á sniðinu: YYYY-MM-DD HH:MM"
-"[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-"'%(value)s' hefur rétt snið (YYYY-MM-DD HH:MM [:ss[.uuuuuu]][TZ]) en það er "
-"ógild dagsetning/tími."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Dagsetning (með tíma)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
-msgstr "'%(value)s' verður að vera heiltala."
+msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Tugatala"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Netfang"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Skjalaslóð"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
-msgstr "'%(value)s' verður að vera fleytitala."
+msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Fleytitala (floating point number)"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Stór (8 bæta) heiltala"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 vistfang"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP tala"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr "'%(value)s' verður að vera eitt eftirtalinna: None, True eða False."
+msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boole-gildi (True, False eða None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Jákvæð heiltala"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Jákvæð lítil heiltala"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slögg (allt að %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Lítil heiltala"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Texti"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-"'%(value)s' er á ógildu sniði. Það verður að vera á sniðinu HH:MM[:ss[."
-"uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-"'%(value)s' er á réttu sniði (HH:MM[:ss[.uuuuuu]]), en það er ógild "
-"dagsetning/tími."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Tími"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "Veffang"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "Skrá"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Mynd"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
-msgstr "Módel %(model)s með lykil %(pk)r er ekki til."
+msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Ytri lykill (Gerð ákveðin af skyldum reit)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Einn-á-einn samband."
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Margir-til-margra samband."
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Þennan reit þarf að fylla út."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Sláðu inn heila tölu."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Sláðu inn heila tölu."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "Gildið má ekki hafa fleiri en %(max)s tölu."
msgstr[1] "Gildið má ekki hafa fleiri en %(max)s tölur."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -684,31 +713,31 @@
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Sláðu inn gilda dagsetningu."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Sláðu inn gilda tímasetningu."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Sláðu inn gilda dagsetningu ásamt tíma."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Engin skrá var send. Athugaðu kótunartegund á forminu (encoding type)."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Engin skrá var send."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Innsend skrá er tóm."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -718,11 +747,11 @@
msgstr[1] ""
"Skráarnafnið má mest vera %(max)d stafir að lengd (það er %(length)d nú)"
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Vinsamlegast sendu annað hvort inn skrá eða merktu í boxið, ekki bæði."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -730,22 +759,26 @@
"Halaðu upp gildri myndskrá. Skráin sem þú halaðir upp var annað hvort gölluð "
"eða ekki mynd."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Veldu gildan valmöguleika. %(value)s er ekki eitt af gildum valmöguleikum."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Sláðu inn lista af gildum."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -753,41 +786,48 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
-msgstr "Gögn fyrir ManagementForm vantar eða hefur verið breytt"
+msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Röð"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Eyða"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Vinsamlegast leiðréttu tvítekin gögn í reit %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Vinsamlegast lagfærðu gögn í reit %(field)s, sem verða að vera einstök."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -796,32 +836,32 @@
"Vinsamlegast leiðréttu tvítekin gögn í reit %(field_name)s sem verða að vera "
"einstök fyrir %(lookup)s í %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Vinsamlegast lagfærðu tvítöldu gögnin fyrir neðan."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Ytri lykill virðist ekki passa við aðallykil eiganda."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Veldu gildan valmöguleika. Valið virðist ekki vera eitt af gildum "
"valmöguleikum."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "'%(pk)s' er ekki gilt sem lykill."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Haltu inni „Control“, eða „Command“ á Mac til þess að velja fleira en eitt."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -830,15 +870,15 @@
"%(datetime)s er ekki hægt að túlka í tímabelti %(current_timezone)s, það "
"getur verið óljóst eða að það er ekki til."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Eins og er:"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Breyta"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Hreinsa"
@@ -854,63 +894,63 @@
msgid "No"
msgstr "Nei"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "já,nei,kannski"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bæti"
msgstr[1] "%(size)d bæti"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "eftirmiðdegi"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "morgun"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "Eftirmiðdegi"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "Morgun"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "miðnætti"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "hádegi"
@@ -1186,117 +1226,133 @@
msgid "December"
msgstr "Desember"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
-msgstr "Þetta er ekki gilt IPv6 vistfang."
+msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "eða"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d ár"
msgstr[1] "%d ár"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d mánuður"
msgstr[1] "%d mánuðir"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d vika"
msgstr[1] "%d vikur"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dagur"
msgstr[1] "%d dagar"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d klukkustund"
msgstr[1] "%d klukkustundir"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d mínúta"
msgstr[1] "%d mínútur"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 mínútur"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Möppulistar eru ekki leyfðir hér."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" er ekki til"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Innihald %(directory)s "
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
-#: views/generic/dates.py:42
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Ekkert ár tilgreint"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Enginn mánuður tilgreindur"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Enginn dagur tilgreindur"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Engin vika tilgreind"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Ekkert %(verbose_name_plural)s í boði."
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1305,7 +1361,7 @@
"Framtíðar %(verbose_name_plural)s ekki í boði því %(class_name)s."
"allow_future er Ósatt."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Ógilt snið dagsetningar \"%(datestr)s\" gefið sniðið \"%(format)s\""
@@ -1315,16 +1371,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Ekkert %(verbose_name)s sem uppfyllir skilyrði"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Þetta er hvorki síðasta síða, né er hægt að breyta í heiltölu."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Tómur listi og '%(class_name)s.allow_empty er Ósatt."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Möppulistar eru ekki leyfðir hér."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" er ekki til"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Innihald %(directory)s "
diff -Nru python-django-1.6.6/django/conf/locale/it/formats.py python-django-1.7.4/django/conf/locale/it/formats.py
--- python-django-1.6.6/django/conf/locale/it/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/it/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -5,14 +5,14 @@
# The *_FORMAT strings use the Django date format syntax,
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = 'd F Y' # 25 Ottobre 2006
-TIME_FORMAT = 'H:i:s' # 14:30:59
-DATETIME_FORMAT = 'l d F Y H:i:s' # Mercoledì 25 Ottobre 2006 14:30:59
-YEAR_MONTH_FORMAT = 'F Y' # Ottobre 2006
-MONTH_DAY_FORMAT = 'j/F' # 10/2006
-SHORT_DATE_FORMAT = 'd/m/Y' # 25/12/2009
-SHORT_DATETIME_FORMAT = 'd/m/Y H:i:s' # 25/10/2009 14:30:59
-FIRST_DAY_OF_WEEK = 1 # Lunedì
+DATE_FORMAT = 'd F Y' # 25 Ottobre 2006
+TIME_FORMAT = 'H:i:s' # 14:30:59
+DATETIME_FORMAT = 'l d F Y H:i:s' # Mercoledì 25 Ottobre 2006 14:30:59
+YEAR_MONTH_FORMAT = 'F Y' # Ottobre 2006
+MONTH_DAY_FORMAT = 'j/F' # 10/2006
+SHORT_DATE_FORMAT = 'd/m/Y' # 25/12/2009
+SHORT_DATETIME_FORMAT = 'd/m/Y H:i:s' # 25/10/2009 14:30:59
+FIRST_DAY_OF_WEEK = 1 # Lunedì
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/it/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/it/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/it/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/it/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/it/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/it/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,18 +2,21 @@
#
# Translators:
# C8E , 2011
+# C8E , 2014
# Denis Darii , 2011
# Flavio Curella , 2013
# Jannis Leidel , 2011
-# Themistoklis Savvidis , 2013
+# Themis Savvidis , 2013
+# Marco Bonetti, 2014
# Nicola Larosa , 2013
+# palmux , 2014
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-10-23 16:31+0000\n"
-"Last-Translator: Flavio Curella \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
"it/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +31,11 @@
#: conf/global_settings.py:52
msgid "Arabic"
-msgstr "arabo"
+msgstr "Arabo"
+
+#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
#: conf/global_settings.py:53
msgid "Azerbaijani"
@@ -36,7 +43,7 @@
#: conf/global_settings.py:54
msgid "Bulgarian"
-msgstr "bulgaro"
+msgstr "Bulgaro"
#: conf/global_settings.py:55
msgid "Belarusian"
@@ -44,7 +51,7 @@
#: conf/global_settings.py:56
msgid "Bengali"
-msgstr "bengali"
+msgstr "Bengalese"
#: conf/global_settings.py:57
msgid "Breton"
@@ -52,352 +59,380 @@
#: conf/global_settings.py:58
msgid "Bosnian"
-msgstr "bosniaco"
+msgstr "Bosniaco"
#: conf/global_settings.py:59
msgid "Catalan"
-msgstr "catalano"
+msgstr "Catalano"
#: conf/global_settings.py:60
msgid "Czech"
-msgstr "ceco"
+msgstr "Ceco"
#: conf/global_settings.py:61
msgid "Welsh"
-msgstr "gallese"
+msgstr "Gallese"
#: conf/global_settings.py:62
msgid "Danish"
-msgstr "danese"
+msgstr "Danese"
#: conf/global_settings.py:63
msgid "German"
-msgstr "tedesco"
+msgstr "Tedesco"
#: conf/global_settings.py:64
msgid "Greek"
-msgstr "greco"
+msgstr "Greco"
#: conf/global_settings.py:65
msgid "English"
-msgstr "inglese"
+msgstr "Inglese"
#: conf/global_settings.py:66
-msgid "British English"
-msgstr "inglese britannico"
+msgid "Australian English"
+msgstr "Inglese Australiano"
#: conf/global_settings.py:67
+msgid "British English"
+msgstr "Inglese britannico"
+
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
-msgstr "spagnolo"
+msgstr "Spagnolo"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
-msgstr "spagnolo argentino"
+msgstr "Spagnolo Argentino"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
-msgstr "Spagnolo messicano"
+msgstr "Spagnolo Messicano"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
-msgstr "Spagnolo nicaraguense"
+msgstr "Spagnolo Nicaraguense"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "Spagnolo venezuelano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
-msgstr "estone"
+msgstr "Estone"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
-msgstr "basco"
+msgstr "Basco"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
-msgstr "persiano"
+msgstr "Persiano"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
-msgstr "finlandese"
+msgstr "Finlandese"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
-msgstr "francese"
+msgstr "Francese"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
-msgstr "frisone"
+msgstr "Frisone"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
-msgstr "irlandese"
+msgstr "Irlandese"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
-msgstr "galiziano"
+msgstr "Galiziano"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
-msgstr "ebraico"
+msgstr "Ebraico"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
-msgstr "hindi"
+msgstr "Hindi"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
-msgstr "croato"
+msgstr "Croato"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
-msgstr "ungherese"
+msgstr "Ungherese"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "Interlingua"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
-msgstr "indonesiano"
+msgstr "Indonesiano"
-#: conf/global_settings.py:87
-msgid "Icelandic"
-msgstr "islandese"
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
#: conf/global_settings.py:88
-msgid "Italian"
-msgstr "italiano"
+msgid "Icelandic"
+msgstr "Islandese"
#: conf/global_settings.py:89
-msgid "Japanese"
-msgstr "giapponese"
+msgid "Italian"
+msgstr "Italiano"
#: conf/global_settings.py:90
-msgid "Georgian"
-msgstr "georgiano"
+msgid "Japanese"
+msgstr "Giapponese"
#: conf/global_settings.py:91
-msgid "Kazakh"
-msgstr "Kazakh"
+msgid "Georgian"
+msgstr "Georgiano"
#: conf/global_settings.py:92
-msgid "Khmer"
-msgstr "khmer"
+msgid "Kazakh"
+msgstr "Kazako"
#: conf/global_settings.py:93
-msgid "Kannada"
-msgstr "kannada"
+msgid "Khmer"
+msgstr "Khmer"
#: conf/global_settings.py:94
-msgid "Korean"
-msgstr "coreano"
+msgid "Kannada"
+msgstr "Kannada"
#: conf/global_settings.py:95
+msgid "Korean"
+msgstr "Coreano"
+
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "Lussemburghese"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
-msgstr "lituano"
+msgstr "Lituano"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
-msgstr "lettone"
+msgstr "Lettone"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
-msgstr "macedone"
+msgstr "Macedone"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
-msgstr "malayalam"
+msgstr "Malayalam"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
-msgstr "mongolo"
+msgstr "Mongolo"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "Burmese"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
-msgstr "norvegese bokmal"
+msgstr "Norvegese Bokmal"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "Nepali"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
-msgstr "olandese"
+msgstr "Olandese"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
-msgstr "norvegese nynorsk"
+msgstr "Norvegese Nynorsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "Ossetico"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
-msgstr "punjabi"
+msgstr "Punjabi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
-msgstr "polacco"
+msgstr "Polacco"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
-msgstr "portoghese"
+msgstr "Portoghese"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
-msgstr "brasiliano portoghese"
+msgstr "Brasiliano Portoghese"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
-msgstr "rumeno"
+msgstr "Rumeno"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
-msgstr "russo"
+msgstr "Russo"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
-msgstr "slovacco"
+msgstr "Slovacco"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
-msgstr "sloveno"
+msgstr "Sloveno"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
-msgstr "albanese"
+msgstr "Albanese"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
-msgstr "serbo"
+msgstr "Serbo"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
-msgstr "serbo latino"
+msgstr "Serbo Latino"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
-msgstr "svedese"
+msgstr "Svedese"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "Swahili"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
-msgstr "tamil"
+msgstr "Tamil"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
-msgstr "telugu"
+msgstr "Telugu"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
-msgstr "tailandese"
+msgstr "Tailandese"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
-msgstr "turco"
+msgstr "Turco"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "Tatar"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "Udmurt"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
-msgstr "ucraino"
+msgstr "Ucraino"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
-msgstr "vietnamita"
+msgstr "Vietnamita"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
-msgstr "cinese semplificato"
+msgstr "Cinese semplificato"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
-msgstr "cinese tradizionale"
+msgstr "Cinese tradizionale"
+
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "Mappa del sito"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "File statici"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "Aggregazione"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "Web Design"
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Inserisci un valore valido."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
-msgstr "Inserisci una URL valida."
+msgstr "Inserisci un URL valido."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
-msgstr "Inserire un intero valido."
+msgstr "Inserire un numero intero valido."
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "Inserisci un indirizzo email valido."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Inserisci uno 'slug' valido contenente lettere, cifre, sottolineati o "
"trattini."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Inserisci un indirizzo IPv4 valido."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "Inserisci un indirizzo IPv6 valido."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Inserisci un indirizzo IPv4 o IPv6 valido."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Inserisci solo cifre separate da virgole."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Assicurati che questo valore sia %(limit_value)s (ora è %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Assicurati che questo valore sia minore o uguale a %(limit_value)s."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Assicuratii che questo valore sia maggiore o uguale a %(limit_value)s."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -412,7 +447,7 @@
"Assicurati che questo valore contenga almeno %(limit_value)d caratteri (ne "
"ha %(show_value)d)."
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -427,88 +462,97 @@
"Assicurati che questo valore non contenga più di %(limit_value)d caratteri "
"(ne ha %(show_value)d)."
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s deve essere unico per %(lookup)s %(date_field)s."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "e"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s con questo %(field_label)s esiste già."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "%(model_name)s con questa %(field_labels)s esiste già."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
-msgstr "Il valore %(value)r non è un'opzione valida."
+msgstr "Il valore %(value)r non è una scelta valida."
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Questo campo non può essere nullo."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Questo campo non può essere vuoto."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s con questo %(field_label)s esiste già."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s deve essere unico per %(date_field_label)s %(lookup_type)s."
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo di tipo: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Intero"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr "Il valore di '%(value)s' deve essere un intero."
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr "Il valore dir '%(value)s' deve essere Vero oppure Falso."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
-msgstr "Booleano (True o False)"
+msgstr "Booleano (Vero o Falso)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Stringa (fino a %(max_length)s)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Interi separati da virgole"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-"Il valore di '%(value)s' ha un formato di data invalido. Deve essere nel "
+"Il valore di '%(value)s' ha un formato di data non valido. Deve essere nel "
"formato AAAA-MM-GG."
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-"Il valore di '%(value)s' ha il corretto formato (AAAA-MM-DD) ma è una data "
-"invalida."
+"Il valore di '%(value)s' ha il corretto formato (AAAA-MM-GG) ma non è una "
+"data valida."
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Data (senza ora)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
@@ -517,88 +561,88 @@
"Il valore di '%(value)s' ha un formato non valido. Deve essere nel formato "
"AAAA-MM-GG HH:MM[:ss[.uuuuuu]][TZ]"
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-"Il valore di '%(value)s' ha il corretto formato (AAAA-MM-GG HH:MM[:ss[."
-"uuuuuu]][TZ]) ma è una data/ora non valida."
+"Il valore di '%(value)s' ha il formato corretto (AAAA-MM-GG HH:MM[:ss[."
+"uuuuuu]][TZ]) ma non è una data/ora valida."
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Data (con ora)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr "Il valore di '%(value)s' deve essere un numero decimale."
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Numero decimale"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Indirizzo email"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
-msgstr "Percorso di file"
+msgstr "Percorso file"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr "Il valore di '%(value)s' deve essere un numero a virgola mobile."
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
-msgstr "Numero decimale"
+msgstr "Numero in virgola mobile"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Intero grande (8 byte)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "Indirizzo IPv4"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "Indirizzo IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
-msgstr "Il valore di '%(value)s' deve essere Nessuno, Vero oppure Falso."
+msgstr "Il valore di '%(value)s' deve essere None, True oppure False."
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (True, False o None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "Intero positivo"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "Piccolo intero positivo"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "Slug (fino a %(max_length)s)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "Piccolo intero"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Testo"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
@@ -607,79 +651,79 @@
"Il valore di '%(value)s' ha un formato non valido. Deve essere nel formato "
"HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-"Il valore di '%(value)s' ha il corretto formato (HH:MM[:ss[.uuuuuu]]) ma è "
-"un'ora non valida."
+"Il valore di '%(value)s' ha il corretto formato (HH:MM[:ss[.uuuuuu]]) ma non "
+"è una data valida."
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Ora"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "Dati binari grezzi"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "File"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "Immagine"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
-msgstr "instanze %(model)s con pk %(pk)r non esiste."
+msgstr "Un'istanza del modello %(model)s con pk %(pk)r non esiste."
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (tipo determinato dal campo collegato)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "Relazione uno a uno"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Relazione molti a molti"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Questo campo è obbligatorio."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Inserisci un numero intero."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Inserisci un numero."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "Assicurati che non vi sia più di %(max)s cifra in totale."
msgstr[1] "Assicurati che non vi siano più di %(max)s cifre in totale."
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] "Assicurati che non vi sia più di %(max)s cifra decimale."
msgstr[1] "Assicurati che non vi siano più di %(max)s cifre decimali."
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -689,32 +733,31 @@
msgstr[1] ""
"Assicurati che non vi siano più di %(max)s cifre prima della virgola."
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Inserisci una data valida."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Inserisci un'ora valida."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Inserisci una data/ora valida."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-"Non è stato inviato alcun file. Verifica il tipo di codifica sulla form."
+msgstr "Non è stato inviato alcun file. Verifica il tipo di codifica sul form."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Nessun file è stato inviato."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Il file inviato è vuoto."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -726,35 +769,39 @@
"Assicurati che questo nome di file non contenga più di %(max)d caratteri (ne "
"ha %(length)d)."
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"È possibile inviare un file o selezionare la casella \"svuota\", ma non "
"entrambi."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-"Carica un'immagine valida. Il file caricato non è un'immagine o è corrotto."
+"Carica un'immagine valida. Il file caricato non è un'immagine o è "
+"un'immagine danneggiata."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
-"Scegli un'opzione valida. %(value)s non compare tra quelle disponibili."
+msgstr "Scegli un'opzione valida. %(value)s non è tra quelle disponibili."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Inserisci una lista di valori."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "Inserisci un valore completo."
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(Campo nascosto %(name)s) %(error)s"
@@ -762,75 +809,83 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
-msgstr "I dati del ManagementForm sono mancanti oppure sono stati manomessi."
+msgstr "I dati del ManagementForm sono mancanti oppure sono stati manomessi"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "Inoltrare %d o meno form."
-msgstr[1] "Inoltrare %d o meno form."
+msgstr[1] "Si prega di inviare %d o meno form."
+
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Inoltrare %d o più form."
+msgstr[1] "Si prega di inviare %d o più form."
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Ordine"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Cancella"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Correggi i dati duplicati di %(field)s."
+msgstr "Si prega di correggere i dati duplicati di %(field)s."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr "Correggi i dati duplicati di %(field)s, che deve essere unico."
+msgstr ""
+"Si prega di correggere i dati duplicati di %(field)s, che deve essere unico."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-"Correggi i dati duplicati di %(field_name)s che deve essere unico/a per "
-"%(lookup)s in %(date_field)s."
+"Si prega di correggere i dati duplicati di %(field_name)s che deve essere "
+"unico/a per %(lookup)s in %(date_field)s."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
-msgstr "Correggi i dati duplicati qui sotto."
+msgstr "Si prega di correggere i dati duplicati qui sotto."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La foreign key inline non concorda con la chiave primaria dell'istanza padre."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Scegli un'opzione valida. La scelta effettuata non compare tra quelle "
"disponibili."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" non è un valore valido per una chiave primaria."
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -839,15 +894,15 @@
" %(datetime)s non può essere interpretato nel fuso orario "
"%(current_timezone)s: potrebbe essere ambiguo o non esistere."
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Attualmente"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
-msgstr "Modifica"
+msgstr "Cambia"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Svuota"
@@ -863,169 +918,169 @@
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "sì,no,forse"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
-msgstr[1] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "mezzanotte"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "mezzogiorno"
#: utils/dates.py:6
msgid "Monday"
-msgstr "lunedì"
+msgstr "Lunedì"
#: utils/dates.py:6
msgid "Tuesday"
-msgstr "martedì"
+msgstr "Martedì"
#: utils/dates.py:6
msgid "Wednesday"
-msgstr "mercoledì"
+msgstr "Mercoledì"
#: utils/dates.py:6
msgid "Thursday"
-msgstr "giovedì"
+msgstr "Giovedì"
#: utils/dates.py:6
msgid "Friday"
-msgstr "venerdì"
+msgstr "Venerdì"
#: utils/dates.py:7
msgid "Saturday"
-msgstr "sabato"
+msgstr "Sabato"
#: utils/dates.py:7
msgid "Sunday"
-msgstr "domenica"
+msgstr "Domenica"
#: 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 "gio"
+msgstr "Gio"
#: utils/dates.py:10
msgid "Fri"
-msgstr "ven"
+msgstr "Ven"
#: utils/dates.py:11
msgid "Sat"
-msgstr "sab"
+msgstr "Sab"
#: utils/dates.py:11
msgid "Sun"
-msgstr "dom"
+msgstr "Dom"
#: utils/dates.py:18
msgid "January"
-msgstr "gennaio"
+msgstr "Gennaio"
#: utils/dates.py:18
msgid "February"
-msgstr "febbraio"
+msgstr "Febbraio"
#: utils/dates.py:18
msgid "March"
-msgstr "marzo"
+msgstr "Marzo"
#: utils/dates.py:18
msgid "April"
-msgstr "aprile"
+msgstr "Aprile"
#: utils/dates.py:18
msgid "May"
-msgstr "maggio"
+msgstr "Maggio"
#: utils/dates.py:18
msgid "June"
-msgstr "giugno"
+msgstr "Giugno"
#: utils/dates.py:19
msgid "July"
-msgstr "luglio"
+msgstr "Luglio"
#: utils/dates.py:19
msgid "August"
-msgstr "agosto"
+msgstr "Agosto"
#: utils/dates.py:19
msgid "September"
-msgstr "settembre"
+msgstr "Settembre"
#: utils/dates.py:19
msgid "October"
-msgstr "ottobre"
+msgstr "Ottobre"
#: utils/dates.py:19
msgid "November"
-msgstr "novembre"
+msgstr "Novembre"
#: utils/dates.py:20
msgid "December"
-msgstr "dicembre"
+msgstr "Dicembre"
#: utils/dates.py:23
msgid "jan"
@@ -1088,27 +1143,27 @@
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Mar."
+msgstr "Marzo"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Apr."
+msgstr "Aprile"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Mag."
+msgstr "Maggio"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Giu."
+msgstr "Giugno"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Lug."
+msgstr "Luglio"
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -1195,117 +1250,145 @@
msgid "December"
msgstr "Dicembre"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "Impossibile importare Pillow nè PIL: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "Impossibile importare il modulo '_imaging' per PIL: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "Questo non è un indirizzo IPv6 valido."
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr " %(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d anno"
msgstr[1] "%d anni"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d mese"
msgstr[1] "%d mesi"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d settimana"
msgstr[1] "%d settimane"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d giorno"
msgstr[1] "%d giorni"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d ora"
msgstr[1] "%d ore"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minuti"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 minuti"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Indici di directory non sono consentiti qui."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "Proibito"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "Verifica CSRF fallita. Richiesta interrotta."
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" non esiste"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Stai vedendo questo messaggio perché questo sito HTTPS richiede una 'Referer "
+"header' che deve essere spedita dal tuo browser web, ma non è stato inviato "
+"nulla. Questa header è richiesta per ragioni di sicurezza, per assicurare "
+"che il tuo browser non sia stato dirottato da terze parti."
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Indice di %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"Se hai configurato il tuo browser web per disattivare l'invio delle "
+"intestazioni \"Referer\", riattiva questo invio, almeno per questo sito, o "
+"per le connessioni HTTPS, o per le connessioni \"same-origin\"."
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Stai vedendo questo messaggio perché questo sito richiede un cookie CSRF "
+"quando invii dei form. Questo cookie è necessario per ragioni di sicurezza, "
+"per assicurare che il tuo browser non sia stato dirottato da terze parti."
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"Se hai configurato il tuo browser web per disattivare l'invio dei cookies, "
+"riattivalo almeno per questo sito, o per connessioni \"same-origin\""
-#: views/generic/dates.py:42
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "Maggiorni informazioni sono disponibili con DEBUG=True"
+
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Anno non specificato"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Mese non specificato"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Giorno non specificato"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Settimana non specificata"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Nessun %(verbose_name_plural)s disponibile"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1314,7 +1397,7 @@
"%(verbose_name_plural)s futuri/e non disponibili/e poichè %(class_name)s."
"allow_future è False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Data non valida '%(datestr)s' con il formato '%(format)s'"
@@ -1324,16 +1407,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "Trovato nessun %(verbose_name)s corrispondente alla query"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "La pagina non è 'ultima', né può essere convertita in un int."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "Pagina non valida (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr "Elenco vuoto e '%(class_name)s.allow_empty' è False."
+msgstr "Lista vuota e '%(class_name)s.allow_empty' è False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Indici di directory non sono consentiti qui."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" non esiste"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indice di %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/ja/formats.py python-django-1.7.4/django/conf/locale/ja/formats.py
--- python-django-1.6.6/django/conf/locale/ja/formats.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ja/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,13 +12,13 @@
MONTH_DAY_FORMAT = 'n月j日'
SHORT_DATE_FORMAT = 'Y/m/d'
SHORT_DATETIME_FORMAT = 'Y/m/d G:i:s'
-# FIRST_DAY_OF_WEEK =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/ja/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ja/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/ja/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ja/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/ja/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ja/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -2,15 +2,15 @@
#
# Translators:
# Jannis Leidel , 2011
-# Shinya Okano , 2012-2013
+# Shinya Okano , 2012-2014
# Tetsuya Morimoto , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-10-05 06:37+0000\n"
-"Last-Translator: Shinya Okano \n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
+"Last-Translator: Jannis Leidel \n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
"ja/)\n"
"MIME-Version: 1.0\n"
@@ -28,6 +28,10 @@
msgstr "アラビア語"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "アゼルバイジャン語"
@@ -80,320 +84,348 @@
msgstr "英語(米国)"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr "英語(オーストラリア)"
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "英語(英国)"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "エスペラント語"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "スペイン語"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "アルゼンチンスペイン語"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "メキシコスペイン語"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "ニカラグアスペイン語"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "ベネズエラスペイン語"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "エストニア語"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "バスク語"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "ペルシア語"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "フィンランド語"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "フランス語"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "フリジア語"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "アイルランド語"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "ガリシア語"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "ヘブライ語"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "ヒンディー語"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "クロアチア語"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "ハンガリー語"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "インターリングア"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "インドネシア語"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "アイスランド語"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "イタリア語"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "日本語"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "グルジア語"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "カザフ語"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "クメール語"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "カンナダ語"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "韓国語"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "ルクセンブルグ語"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "リトアニア語"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "ラトビア語"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "マケドニア語"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "マラヤーラム語"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "モンゴル語"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
+msgid "Marathi"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Burmese"
msgstr "ビルマ語"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "ノルウェーのブークモール"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "ネパール語"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "オランダ語"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "ノルウェーのニーノシュク"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "オセット語"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "パンジャブ語"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "ポーランド語"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "ポルトガル語"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "ブラジルポルトガル語"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "ルーマニア語"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "ロシア語"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "スロバキア語"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "スロヴェニア語"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "アルバニア語"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "セルビア語"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "セルビア語ラテン文字"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "スウェーデン語"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "スワヒリ語"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "タミル語"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "テルグ語"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "タイ語"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "トルコ語"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "タタール語"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "ウドムルト語"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ウクライナ語"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "ウルドゥー語"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "ベトナム語"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "簡体字中国語"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "繁体字中国語"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr "サイトマップ"
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "静的ファイル"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr "シンジケーション"
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr "ウェブデザイン"
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "値を正しく入力してください。"
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "URLを正しく入力してください。"
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr "整数を正しく入力してください。"
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "有効なメールアドレスを入力してください。"
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "slug には半角の英数字、アンダースコア、ハイフン以外は使用できません。"
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "有効なIPアドレス (IPv4) を入力してください。"
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "IPv6の正しいアドレスを入力してください。"
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "IPv4またはIPv6の正しいアドレスを入力してください。"
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "カンマ区切りの数字だけを入力してください。"
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"この値は %(limit_value)s でなければなりません(実際には %(show_value)s でし"
"た) 。"
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "この値は %(limit_value)s 以下でなければなりません。"
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "この値は %(limit_value)s 以上でなければなりません。"
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -405,7 +437,7 @@
"この値が少なくとも %(limit_value)d 文字以上であることを確認してください"
"( %(show_value)d 文字になっています)。"
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -417,68 +449,76 @@
"この値は %(limit_value)d 文字以下でなければなりません( %(show_value)d 文字に"
"なっています)。"
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"%(date_field)s %(lookup)s では %(field_name)s がユニークである必要がありま"
-"す。"
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "と"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "この %(field_label)s を持った %(model_name)s が既に存在します。"
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "この %(field_labels)s を持った %(model_name)s が既に存在します。"
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr "%(value)r は有効な選択肢ではありません。"
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "このフィールドには NULL を指定できません。"
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "このフィールドは空ではいけません。"
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "この %(field_label)s を持った %(model_name)s が既に存在します。"
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(date_field_label)s %(lookup_type)s では %(field_label)s がユニークである必"
+"要があります。"
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "タイプが %(field_type)s のフィールド"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "整数"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr "'%(value)s' は整数値にしなければなりません。"
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr "'%(value)s' は真偽値にしなければなりません。"
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "ブール値 (真: True または偽: False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "文字列 ( %(max_length)s 字まで )"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "カンマ区切りの整数"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
@@ -486,18 +526,18 @@
msgstr ""
"'%(value)s' は無効な日付形式です。YYYY-MM-DD形式にしなければなりません。"
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr "'%(value)s' は有効な日付形式(YYYY-MM-DD)ですが、日付が不正です。"
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "日付"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
@@ -506,7 +546,7 @@
"'%(value)s' は無効な形式の値です。 YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] 形式で"
"なければなりません。"
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
@@ -515,79 +555,79 @@
"'%(value)s' は正しい形式(YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ])の値ですが、無効"
"な日時です。"
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "日時"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr "'%(value)s' は10進浮動小数値にしなければなりません。"
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "10 進数 (小数可)"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "メールアドレス"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "ファイルの場所"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr "'%(value)s' は小数値にしなければなりません。"
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "浮動小数点"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "大きな(8バイト)整数"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4アドレス"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP アドレス"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr "'%(value)s' はNone、TrueまたはFalseの値でなければなりません。"
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "ブール値 (真: True 、偽: False または None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "正の整数"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "小さな正の整数"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "スラグ(%(max_length)s文字以内)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "小さな整数"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "テキスト"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
@@ -596,75 +636,75 @@
"'%(value)s' は無効な形式の値です。 HH:MM[:ss[.uuuuuu]] 形式でなければなりませ"
"ん。"
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr "'%(value)s' は正しい形式(HH:MM[:ss[.uuuuuu]])ですが、無効な時刻です。"
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "時刻"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr "生のバイナリデータ"
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "ファイル"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "画像"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr "主キーが %(pk)r である %(model)s インスタンスは存在しません。"
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "外部キー(型は関連フィールドによって決まります)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "1対1の関連"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "多対多の関連"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "このフィールドは必須です。"
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "整数を入力してください。"
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "整数を入力してください。"
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] "この値は合計 %(max)s 桁以内でなければなりません。"
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] "この値は小数点以下が合計 %(max)s 桁以内でなければなりません。"
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -672,32 +712,32 @@
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] "この値は小数点より前が合計 %(max)s 桁以内でなければなりません。"
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "日付を正しく入力してください。"
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "時間を正しく入力してください。"
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "日付/時間を正しく入力してください。"
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"ファイルが取得できませんでした。formのencoding typeを確認してください。"
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "ファイルが送信されていません。"
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "入力されたファイルは空です。"
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -706,13 +746,13 @@
"このファイル名は %(max)d 文字以下でなければなりません( %(length)d 文字になっ"
"ています)。"
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"ファイルを投稿するか、クリアチェックボックスをチェックするかどちらかを選択し"
"てください。両方とも行ってはいけません。"
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -720,21 +760,25 @@
"画像をアップロードしてください。アップロードしたファイルは画像でないか、また"
"は壊れています。"
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "正しく選択してください。 %(value)s は候補にありません。"
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "リストを入力してください。"
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr "すべての値を入力してください。"
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ":"
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr "(隠しフィールド %(name)s) %(error)s"
@@ -742,41 +786,47 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ":?.!"
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr "ManagementFormデータが見つからないか、改竄されています。"
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] "%d 個またはそれより少ないフォームを送信してください。"
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "%d 個またはそれより多いフォームを送信してください。"
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "並び変え"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "削除"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s の重複したデータを修正してください。"
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"%(field)s の重複したデータを修正してください。このフィールドはユニークである"
"必要があります。"
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -785,31 +835,31 @@
"%(field_name)s の重複したデータを修正してください。%(date_field)s %(lookup)s "
"では %(field_name)s がユニークである必要があります。"
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "下記の重複したデータを修正してください。"
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "インライン外部キーが親インスタンスの主キーと一致しません。"
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "正しく選択してください。選択したものは候補にありません。"
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr "\"%(pk)s\" は主キーとして無効な値です。"
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"複数選択するときには Control キーを押したまま選択してください。Mac は "
"Command キーを使ってください"
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -818,15 +868,15 @@
"%(datetime)s は%(current_timezone)sのタイムゾーンでは解釈できませんでした。そ"
"れは曖昧であるか、存在しない可能性があります。"
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "現在"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "変更"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "クリア"
@@ -842,62 +892,62 @@
msgid "No"
msgstr "いいえ"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "はい,いいえ,たぶん"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d バイト"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "0時"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "12時"
@@ -1173,111 +1223,138 @@
msgid "December"
msgstr "12月"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr "PillowとPILのどちらもインポートできませんでした: %s"
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr "PILの '_imaging' モジュールがインポートできませんでした: %s"
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr "これは有効なIPv6アドレスではありません。"
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "または"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d 年"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d ヶ月"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d 週間"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d 日"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d 時間"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d 分"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 分"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
-msgstr "Directory indexes are not allowed here."
+#: views/csrf.py:105
+msgid "Forbidden"
+msgstr "アクセス禁止"
+
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr "CSRF検証に失敗したため、リクエストは中断されました。"
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" does not exist"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"このメッセージが表示されている理由は、このHTTPSのサイトはウェブブラウザからリ"
+"ファラーヘッダが送信されることを必須としていますが、送信されなかったためで"
+"す。このヘッダはセキュリティ上の理由(使用中のブラウザが第三者によってハイ"
+"ジャックされていないことを確認するため)で必要です。"
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Index of %(directory)s"
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"もしブラウザのリファラーヘッダを無効に設定しているならば、HTTPS接続やsame-"
+"originリクエストのために、少なくともこのサイトでは再度有効にしてください。"
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"このメッセージが表示されている理由は、このサイトはフォーム送信時にCSRFクッ"
+"キーを必須としているためです。このクッキーはセキュリティ上の理由(使用中のブラ"
+"ウザが第三者によってハイジャックされていないことを確認するため)で必要です。"
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"もしブラウザのクッキーを無効に設定しているならば、same-originリクエストのため"
+"に少なくともこのサイトでは再度有効にしてください。"
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
+msgstr "詳細な情報は DEBUG=True を設定すると利用できます。"
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "年が未指定です"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "月が未指定です"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "日が未指定です"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "週が未指定です"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s は利用できません"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1286,7 +1363,7 @@
"%(class_name)s.allow_futureがFalseであるため、未来の%(verbose_name_plural)sは"
"利用できません。"
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "指定された形式 '%(format)s' では '%(datestr)s' は無効な日付文字列です"
@@ -1296,16 +1373,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "クエリーに一致する %(verbose_name)s は見つかりませんでした"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "ページは数値に変換できる値、または 'last' ではありません。"
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr "無効なページです (%(page_number)s): %(message)s"
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "空の一覧かつ '%(class_name)s.allow_empty' がFalseです。"
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr "Directory indexes are not allowed here."
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" does not exist"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Index of %(directory)s"
diff -Nru python-django-1.6.6/django/conf/locale/ka/formats.py python-django-1.7.4/django/conf/locale/ka/formats.py
--- python-django-1.6.6/django/conf/locale/ka/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ka/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -12,7 +12,7 @@
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'j.M.Y'
SHORT_DATETIME_FORMAT = 'j.M.Y H:i:s'
-FIRST_DAY_OF_WEEK = 1 # (Monday)
+FIRST_DAY_OF_WEEK = 1 # (Monday)
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/ka/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ka/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/ka/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ka/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/ka/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ka/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -1,15 +1,15 @@
# This file is distributed under the same license as the Django package.
#
# Translators:
-# André Bouatchidzé , 2013
-# David Avsajanishvili , 2011
+# André Bouatchidzé , 2013-2014
+# avsd05 , 2011
# Jannis Leidel , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
"ka/)\n"
@@ -28,6 +28,10 @@
msgstr "არაბული"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "აზერბაიჯანული"
@@ -80,320 +84,348 @@
msgstr "ინგლისური"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "ბრიტანეთის ინგლისური"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr "ესპერანტო"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "ესპანური"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "არგენტინის ესპანური"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "მექსიკური ესპანური"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "ნიკარაგუული ესპანური"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr "ვენესუელის ესპანური"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "ესტონური"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "ბასკური"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "სპარსული"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "ფინური"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "ფრანგული"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "ფრისიული"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "ირლანდიური"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "გალიციური"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "ებრაული"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "ჰინდი"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "ხორვატიული"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "უნგრული"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr "ინტერლინგუა"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "ინდონეზიური"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "ისლანდიური"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "იტალიური"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "იაპონური"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "ქართული"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr "ყაზახური"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "ხმერული"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "კანნადა"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "კორეული"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr "ლუქსემბურგული"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "ლიტვური"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "ლატვიური"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "მაკედონიური"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "მალაიზიური"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "მონღოლური"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr "ბირმული"
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "ნორვეგიული-ბოკმალი"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr "ნეპალური"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "ჰოლანდიური"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "ნორვეგიული-ნინორსკი"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr "ოსური"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "პუნჯაბი"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "პოლონური"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "პორტუგალიური"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "ბრაზილიური პორტუგალიური"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "რუმინული"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "რუსული"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "სლოვაკური"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "სლოვენიური"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "ალბანური"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "სერბული"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "სერბული (ლათინური)"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "შვედური"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr "სუაჰილი"
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "თამილური"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "ტელუგუ"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "ტაი"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "თურქული"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr "თათრული"
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr "უდმურტული"
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "უკრაინული"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "ურდუ"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "ვიეტნამური"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "გამარტივებული ჩინური"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "ტრადიციული ჩინური"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr "სტატიკური ფაილები"
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "შეიყვანეთ სწორი მნიშვნელობა."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "შეიყვანეთ სწორი URL."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr "შეიყვანეთ მართებული ელფოსტის მისამართი."
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"შეიყვანეთ სწორი 'slug'-მნიშვნელობა, რომელიც შეიცავს მხოლოდ ასოებს, ციფრებს, "
"ხაზგასმის ნიშნებს და დეფისებს."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "შეიყვანეთ სწორი IPv4 მისამართი."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "შეიყვანეთ მართებული IPv6 მისამართი."
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "შეიყვანეთ მართებული IPv4 ან IPv6 მისამართი."
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "შეიყვანეთ მხოლოდ მძიმეებით გამოყოფილი ციფრები."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "მნიშვნელობა უნდა იყოს %(limit_value)s (იგი არის %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "მნიშვნელობა უნდა იყოს %(limit_value)s-ზე ნაკლები ან ტოლი."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "მნიშვნელობა უნდა იყოს %(limit_value)s-ზე მეტი ან ტოლი."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -403,7 +435,7 @@
"%(show_value)d)."
msgstr[0] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -413,245 +445,253 @@
"%(show_value)d)."
msgstr[0] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s უნიკალური უნდა იყოს %(date_field)s-თვის %(lookup)s-ზე."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "და"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s მოცემული %(field_label)s-ით უკვე არსებობს."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "ეს ველი არ შეიძლება იყოს null."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "ეს ველი არ შეიძლება იყოს ცარიელი."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s მოცემული %(field_label)s-ით უკვე არსებობს."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "ველის ტიპი: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "მთელი"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "ლოგიკური (True ან False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "სტრიქონი (%(max_length)s სიმბოლომდე)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "მძიმით გამოყოფილი მთელი რიცხვები"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "თარიღი (დროის გარეშე)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "თარიღი (დროსთან ერთად)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "ათობითი რიცხვი"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "ელ. ფოსტის მისამართი"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "გზა ფაილისაკენ"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "რიცხვი მცოცავი წერტილით"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "დიდი მთელი (8-ბაიტიანი)"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 მისამართი"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP-მისამართი"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "ლოგიკური (True, False ან None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr "დადებითი მთელი რიცხვი"
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr "დადებითი პატარა მთელი რიცხვი"
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr "სლაგი (%(max_length)s-მდე)"
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr "პატარა მთელი რიცხვი"
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "ტექსტი"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "დრო"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr "ფაილი"
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr "გამოსახულება"
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "გარე გასაღები (ტიპი განისაზღვრება დაკავშირებული ველის ტიპით)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "კავშირი ერთი-ერთტან"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "კავშირი მრავალი-მრავალთან"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "ეს ველი აუცილებელია."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "შეიყვანეთ მთელი რიცხვი"
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "შეიყვანეთ რიცხვი."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -659,43 +699,43 @@
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "შეიყვანეთ სწორი თარიღი."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "შეიყვანეთ სწორი დრო."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "შეიყვანეთ სწორი თარიღი და დრო."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"ფაილი არ იყო გამოგზავნილი. შეამოწმეთ კოდირების ტიპი მოცემული ფორმისათვის."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "ფაილი არ იყო გამოგზავნილი."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "გამოგზავნილი ფაილი ცარიელია."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr[0] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "ან გამოგზავნეთ ფაილი, ან მონიშნეთ \"წაშლის\" დროშა."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -703,21 +743,25 @@
"ატვირთეთ დასაშვები გამოსახულება. თქვენს მიერ გამოგზავნილი ფაილი ან არ არის "
"გამოსახულება, ან დაზიანებულია."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "აირჩიეთ დასაშვები მნიშვნელობა. %(value)s დასაშვები არ არის."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "შეიყვანეთ მნიშვნელობების სია."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -725,41 +769,47 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "დალაგება"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "წავშალოთ"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "გთხოვთ, შეასწოროთ დუბლირებული მონაცემები %(field)s-თვის."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობა %(field)s ველისთვის, რომელიც უნდა "
"იყოს უნიკალური."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -768,46 +818,46 @@
"გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობა %(field_name)s ველისთვის, რომელიც "
"უნდა იყოს უნიკალური %(lookup)s-ზე, %(date_field)s-თვის."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობები."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "გარე გასაღების მნიშვნელობა მშობლის პირველად გასაღებს არ ემთხვევა."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "აირჩიეთ დასაშვები მნიშვნელობა. ეს არჩევანი დასაშვები არ არის."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"დააჭირეთ \"Control\", ან \"Command\" Mac-ზე, ერთზე მეტი მნიშვნელობის "
"ასარჩევად."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "ამჟამად"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "შეცვლა"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "წაშლა"
@@ -823,62 +873,62 @@
msgid "No"
msgstr "არა"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "კი,არა,შესაძლოა"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d ბაიტი"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s კბ"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s მბ"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s გბ"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s ტბ"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s პბ"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "შუაღამე"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "შუადღე"
@@ -1154,111 +1204,127 @@
msgid "December"
msgstr "დეკემბერი"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr "%(truncated_text)s..."
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "ან"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d წელი"
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d თვე"
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d კვირა"
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d დღე"
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d საათი"
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d წუთი"
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr "0 წუთი"
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
+#: views/csrf.py:105
+msgid "Forbidden"
msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" არ არსებობს"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
msgstr ""
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "არ არის მითითებული წელი"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "არ არის მითითებული თვე"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "არ არის მითითებული დღე"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "არ არის მითითებული კვირა"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s არ არსებობს"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1267,7 +1333,7 @@
"მომავალი %(verbose_name_plural)s არ არსებობს იმიტომ, რომ %(class_name)s."
"allow_future არის False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1278,16 +1344,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "არ მოიძებნა არცერთი მოთხოვნის თანმხვედრი %(verbose_name)s"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "ცარიელი სია და '%(class_name)s.allow_empty' არის False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" არ არსებობს"
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/kk/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/kk/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/kk/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/kk/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/kk/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/kk/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -6,10 +6,10 @@
# yun_man_ger , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
"kk/)\n"
@@ -28,6 +28,10 @@
msgstr "Араб"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "Әзірбайжан"
@@ -80,323 +84,351 @@
msgstr "Ағылшын"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "Британдық ағылшын"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "Испан"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "Аргентиналық испан"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "Мексикалық испан"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "Никарагуа испан"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "Эстон"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "Баск"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "Парсы"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "Фин"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "Француз"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "Фриз"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "Ирландия"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "Галиц"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "Иврит"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "Хинди"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "Кроат"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "Венгрия"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "Индонезия"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "Исладия"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "Итальян"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "Жапон"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "Грузин"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "Кхмер"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "Канада"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "Корей"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "Литва"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "Латвия"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "Македон"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "Малаялам"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "Монғол"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "Норвегиялық букмол"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "Дат"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "Норвегиялық нюнор"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "Пенджаб"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "Поляк"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "Португал"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "Бразилиялық португал"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "Роман"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "Орыс"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "Словак"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "Славян"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "Албан"
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "Серб"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "Сербиялық латын"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "Швед"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr ""
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "Тамиль"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "Телугу"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "Тай"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "Түрік"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr ""
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "Украин"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "Урду"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "Вьетнам"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "Жеңілдетілген қытай"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "Дәстүрлі қытай"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "Тура мәнін енгізіңіз."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "Тура URL-ді енгізіңіз."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Тек әріптерден, сандардан, астыңғы сызықтардан немесе дефистерден құралатын "
"тура 'slug'-ті енгізіңіз."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "Тура IPv4 адресті енгізіңіз."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr ""
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "Тек үтірлермен бөлінген цифрлерді енгізіңіз."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Бұл мәннің %(limit_value)s екендігін тексеріңіз (қазір ол %(show_value)s)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Бұл мәннің мынадан %(limit_value)s кіші немесе тең екендігін тексеріңіз."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Бұл мәннің мынадан %(limit_value)s үлкен немесе тең екендігін тексеріңіз."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -406,7 +438,7 @@
"%(show_value)d)."
msgstr[0] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -416,247 +448,253 @@
"%(show_value)d)."
msgstr[0] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"%(field_name)s мәні %(date_field)s жолақтың ішінде %(lookup)s үшін бірегей "
-"болу керек."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "және"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s %(field_label)s жолақпен бұрыннан бар."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "Бұл жолақ null болмау керек."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "Бұл жолақ бос болмау керек."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s %(field_label)s жолақпен бұрыннан бар."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Жолақтын түрі: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "Бүтін сан"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boolean (True немесе False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Жол (%(max_length)s символға дейін)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "Үтірмен бөлінген бүтін сандар"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "Дата (уақытсыз)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "Дата (уақытпен)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "Ондық сан"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr "Email адрес"
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "Файл жолы"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "Реал сан"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "Ұзын (8 байт) бүтін сан"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr ""
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP мекенжайы"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Булеан (True, False немесе None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr ""
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "Мәтін"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "Уақыт"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr ""
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr ""
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (тип related field арқылы анықталады)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "One-to-one қатынас"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "Many-to-many қатынас"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "Бұл өрісті толтыру міндетті."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "Толық санды енгізіңіз."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "Сан енгізіңіз."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -664,63 +702,67 @@
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "Дұрыс күнді енгізіңіз."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "Дұрыс уақытты енгізіңіз."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "Дұрыс күнді/уақытты енгізіңіз."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ешқандай файл жіберілмеді. Форманың кодтау түрін тексеріңіз."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "Ешқандай файл жіберілмеді."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "Бос файл жіберілді."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr[0] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Файлды жіберіңіз немесе тазалауды белгіленіз, екеуін бірге емес."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
"Дұрыс сүретті жүктеңіз. Сіз жүктеген файл - сүрет емес немесе бұзылған сүрет."
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Дұрыс тандау жасаңыз. %(value)s дұрыс тандау емес."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "Мәндер тізімін енгізіңіз."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -728,39 +770,45 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "Сұрыптау"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "Жою"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s жолақтағы қайталанған мәнді түзетіңіз."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "%(field)s жолақтағы мәнді түзетіңіз, ол бірегей болу керек."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -769,47 +817,47 @@
"%(field_name)s жолақтағы мәнді түзетіңіз. Ол %(date_field)s жолақтың ішінде "
"%(lookup)s үшін бірегей болу керек."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "Қайталанатын мәндерді түзетіңіз."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Кірістірілген сыртқы кілт аталық дананың бастапқы кілтімен сәйкес келмейді."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Дұрыс нұсқаны таңдаңыз. Бұл нұсқа дұрыс таңдаулардың арасында жоқ."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Бірден көп элемент таңдау үшін \"Control\" немесе МасBook-те \"Command\" "
"батырмасын басып тұрыңыз."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "Кәзіргі"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "Түзету"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "Тазалау"
@@ -825,62 +873,62 @@
msgid "No"
msgstr "Жоқ"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "иә,жоқ,мүмкін"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d байт"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s КБ"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s МБ"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s ГБ"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s ТБ"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s ПБ"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "Т.Қ."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "Т.Ж."
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "ТҚ"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "ТЖ"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "түнжарым"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "түсқайта"
@@ -1156,111 +1204,127 @@
msgid "December"
msgstr "Желтоқсан"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "немесе"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
+#: views/csrf.py:105
+msgid "Forbidden"
msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
msgstr ""
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "Жыл таңдалмаған"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "Ай таңдалмаған"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "Күн таңдалмаған"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "Апта таңдалмаған"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s қол жеткізгісіз"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1269,7 +1333,7 @@
"Болашақ %(verbose_name_plural)s қол жеткізгісіз, себебі %(class_name)s."
"allow_future False."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "'%(format)s' пішімі үшін дұрыс емес '%(datestr)s' уақыт жолы"
@@ -1279,16 +1343,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "%(verbose_name)s табылған жоқ"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Бет соңғы емес және оны санға түрлендіруге болмайды."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Бос тізім және '%(class_name)s.allow_empty' - False."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
diff -Nru python-django-1.6.6/django/conf/locale/km/formats.py python-django-1.7.4/django/conf/locale/km/formats.py
--- python-django-1.6.6/django/conf/locale/km/formats.py 2014-08-20 20:06:02.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/km/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -8,17 +8,17 @@
DATE_FORMAT = 'j ខែ F ឆ្នាំ Y'
TIME_FORMAT = 'G:i:s'
DATETIME_FORMAT = 'j ខែ F ឆ្នាំ Y, G:i:s'
-# YEAR_MONTH_FORMAT =
+# YEAR_MONTH_FORMAT =
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'j M Y'
SHORT_DATETIME_FORMAT = 'j M Y, G:i:s'
-# FIRST_DAY_OF_WEEK =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/km/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/km/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/km/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/km/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/km/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/km/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -4,10 +4,10 @@
# Jannis Leidel , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:51+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/django/language/"
"km/)\n"
@@ -26,6 +26,10 @@
msgstr "ភាសាអារ៉ាប់"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr ""
@@ -78,318 +82,346 @@
msgstr "ភាសាអង់គ្លេស"
#: conf/global_settings.py:66
-msgid "British English"
+msgid "Australian English"
msgstr ""
#: conf/global_settings.py:67
-msgid "Esperanto"
+msgid "British English"
msgstr ""
#: conf/global_settings.py:68
+msgid "Esperanto"
+msgstr ""
+
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "ភាសាអេស្ប៉ាញ"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr ""
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr ""
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr ""
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr ""
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "ភាសាហ្វាំងឡង់"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "ភាសាបារាំង"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "ភាសាហ្កែលិគ"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "ភាសាហេប្រិ"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr ""
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "ភាសាហុងគ្រី"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "ភាសាអ៉ីស្លង់"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "ភាសាអ៊ីតាលី"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "ភាសាជប៉ុន"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr ""
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr ""
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
-msgid "Norwegian Bokmal"
+msgid "Burmese"
msgstr ""
#: conf/global_settings.py:103
-msgid "Nepali"
+msgid "Norwegian Bokmal"
msgstr ""
#: conf/global_settings.py:104
+msgid "Nepali"
+msgstr ""
+
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "ភាសាហ្វាំងឡង់"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr ""
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr ""
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr ""
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "ភាសារូម៉ានី"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "ភាសាรัរូស្ស៉ី"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "ភាសាស្លូវ៉ាគី"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "ភាសាស្លូវ៉ានី"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr ""
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "ភាសាស៊ុយអែដ"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr ""
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "ភាសាតាមីល"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "ភាសាទួរគី"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr ""
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ភាសាអ៊ុយក្រែន"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr ""
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "ភាសាចិនសាមញ្ញ"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "ភាសាចិនបុរាណ"
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr ""
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr ""
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr ""
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "បំពេញតែលេខហើយផ្តាច់ចេញពីគ្នាដោយសញ្ញាក្បៀស។"
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -399,7 +431,7 @@
"%(show_value)d)."
msgstr[0] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -409,245 +441,253 @@
"%(show_value)d)."
msgstr[0] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "និង"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
msgstr ""
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "ចាំបាច់បំពេញទិន្នន័យកន្លែងនេះ។"
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr ""
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "ចំនួនពិត(Integer)"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "Boolean (អាចជា True រឺ False)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "ចំនួនពិត(Integer) ដែលផ្តាច់ចេញពីគ្នាដោយក្បៀស"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "កាលបរិច្ឆេទ (Date) (មិនមានសរសេរម៉ោង)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "កាលបរិច្ឆេទ (Date) (មានសរសេរម៉ោង)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "ចំនួនទសភាគ (Decimal)"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr ""
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "ផ្លូវទៅកាន់ឯកសារ"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr ""
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "លេខ IP"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (អាចជា True រឺ False រឺ None)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr ""
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "អត្ថបទ"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "ពេលវេលា"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "អាស័យដ្ឋានគេហទំព័រ(URL)"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr ""
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr ""
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr ""
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "ចាំបាច់បំពេញទិន្នន័យកន្លែងនេះ។"
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "បំពេញចំនួនទាំងអស់។"
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr ""
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -655,62 +695,66 @@
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr ""
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr ""
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr ""
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr "មិនមានឯកសារត្រូវបានជ្រើសរើស។ សូមពិនិត្យប្រភេទឯកសារម្តងទៀត។"
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr ""
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "ពុំមានឯកសារ។"
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr[0] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "រូបភាពដែលទាញយកមិនត្រឹមត្រូវ ប្រហែលជាមិនមែនជារូបភាព ឬក៏ជា រូបភាពខូច។"
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr ""
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -718,84 +762,90 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr ""
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "លប់"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"សូមចុចប៉ូតុន \"Control\", ឬ \"Command\" ចំពោះកុំព្យូទ័រ Mac, ដើម្បីជ្រើសរើសច្រើនជាងមួយ។"
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr ""
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "ផ្លាស់ប្តូរ"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr ""
@@ -811,62 +861,62 @@
msgid "No"
msgstr "មិនយល់ព្រម"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "យល់ព្រម មិនយល់ព្រម ប្រហែល"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr ""
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr ""
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr ""
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr ""
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr ""
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr ""
@@ -1142,118 +1192,134 @@
msgid "December"
msgstr "ធ្នូ"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ""
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
+#: views/csrf.py:105
+msgid "Forbidden"
msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
msgstr ""
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr ""
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr ""
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr ""
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1263,16 +1329,30 @@
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
diff -Nru python-django-1.6.6/django/conf/locale/kn/formats.py python-django-1.7.4/django/conf/locale/kn/formats.py
--- python-django-1.6.6/django/conf/locale/kn/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/kn/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -7,18 +7,18 @@
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'j F Y'
TIME_FORMAT = 'h:i:s A'
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'j M Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
-# DECIMAL_SEPARATOR =
-# THOUSAND_SEPARATOR =
-# NUMBER_GROUPING =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+# DECIMAL_SEPARATOR =
+# THOUSAND_SEPARATOR =
+# NUMBER_GROUPING =
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/kn/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/kn/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/kn/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/kn/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/kn/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/kn/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -6,10 +6,10 @@
# Ramakrishna Yekulla , 2011
msgid ""
msgstr ""
-"Project-Id-Version: django-core\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 09:54+0200\n"
-"PO-Revision-Date: 2013-08-17 08:48+0000\n"
+"POT-Creation-Date: 2014-08-23 14:10+0200\n"
+"PO-Revision-Date: 2014-08-24 08:52+0000\n"
"Last-Translator: Jannis Leidel \n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
"kn/)\n"
@@ -28,6 +28,10 @@
msgstr "ಅರೇಬಿಕ್"
#: conf/global_settings.py:53
+msgid "Asturian"
+msgstr ""
+
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr "ಆಜೆರ್ಬೈಜನಿ"
@@ -80,325 +84,353 @@
msgstr "ಇಂಗ್ಲಿಷ್"
#: conf/global_settings.py:66
+msgid "Australian English"
+msgstr ""
+
+#: conf/global_settings.py:67
msgid "British English"
msgstr "ಬ್ರಿಟೀಶ್ ಇಂಗ್ಲಿಷ್"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Esperanto"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Spanish"
msgstr "ಸ್ಪ್ಯಾನಿಷ್"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Argentinian Spanish"
msgstr "ಅರ್ಜೆಂಟಿನಿಯನ್ ಸ್ಪಾನಿಷ್"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Mexican Spanish"
msgstr "ಮೆಕ್ಸಿಕನ್ ಸ್ಪಾನಿಷ್"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Nicaraguan Spanish"
msgstr "nicarguan ಸ್ಪಾನಿಷ್"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Estonian"
msgstr "ಎಷ್ಟೋನಿಯನ್"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Basque"
msgstr "ಬಾಸ್ಕ್"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Persian"
msgstr "ಪರ್ಶಿಯನ್"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Finnish"
msgstr "ಫಿನ್ನಿಶ್"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "French"
msgstr "ಫ್ರೆಂಚ್"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Frisian"
msgstr "ಫ್ರಿಸಿಯನ್"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Irish"
msgstr "ಐರಿಶ್"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Galician"
msgstr "ಗೆಲಿಶಿಯನ್"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Hebrew"
msgstr "ಹೀಬ್ರೂ"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Hindi"
msgstr "ಹಿಂದಿ"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Croatian"
msgstr "ಕ್ರೊಯೇಶಿಯನ್"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Hungarian"
msgstr "ಹಂಗೇರಿಯನ್"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Indonesian"
msgstr "ಇಂಡೋನಿಶಿಯನ್"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
+msgid "Ido"
+msgstr ""
+
+#: conf/global_settings.py:88
msgid "Icelandic"
msgstr "ಐಸ್ಲ್ಯಾಂಡಿಕ್"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Italian"
msgstr "ಇಟಾಲಿಯನ್"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Japanese"
msgstr "ಜಾಪನೀಸ್"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Georgian"
msgstr "ಜಾರ್ಜೆಯನ್ "
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Kazakh"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Khmer"
msgstr "ಖಮೇರ್"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Kannada"
msgstr "ಕನ್ನಡ"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Korean"
msgstr "ಕೊರಿಯನ್"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Lithuanian"
msgstr "ಲಿತುವಾನಿಯನ್ "
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Latvian"
msgstr "ಲಾಟ್ವಿಯನ್"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Macedonian"
msgstr "ಮೆಸಡೊನಿಯನ್"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Malayalam"
msgstr "ಮಲಯಾಳಂ"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Mongolian"
msgstr "ಮಂಗೊಲಿಯನ್"
-#: conf/global_settings.py:101
-msgid "Burmese"
+#: conf/global_settings.py:102
+msgid "Marathi"
msgstr ""
#: conf/global_settings.py:102
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:103
msgid "Norwegian Bokmal"
msgstr "ನಾರ್ವೇಜಿಯನ್ ಬೋಕ್ಮಲ್"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Nepali"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Dutch"
msgstr "ಡಚ್"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Norwegian Nynorsk"
msgstr "ನಾರ್ವೇಜಿಯನ್ ನಿನೋರ್ಕ್"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:108
msgid "Punjabi"
msgstr "ಪಂಜಾಬಿ"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:109
msgid "Polish"
msgstr "ಪೋಲಿಷ್"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:110
msgid "Portuguese"
msgstr "ಪೋರ್ಚುಗೀಸ್"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:111
msgid "Brazilian Portuguese"
msgstr "ಬ್ರಜೀಲಿಯನ್ ಪೋರ್ಚುಗೀಸ್"
-#: conf/global_settings.py:111
+#: conf/global_settings.py:112
msgid "Romanian"
msgstr "ರೋಮೇನಿಯನ್"
-#: conf/global_settings.py:112
+#: conf/global_settings.py:113
msgid "Russian"
msgstr "ರಶಿಯನ್"
-#: conf/global_settings.py:113
+#: conf/global_settings.py:114
msgid "Slovak"
msgstr "ಸ್ಲೋವಾಕ್"
-#: conf/global_settings.py:114
+#: conf/global_settings.py:115
msgid "Slovenian"
msgstr "ಸ್ಲೋವೇನಿಯನ್"
-#: conf/global_settings.py:115
+#: conf/global_settings.py:116
msgid "Albanian"
msgstr "ಅಲ್ಬೆನಿಯನ್ "
-#: conf/global_settings.py:116
+#: conf/global_settings.py:117
msgid "Serbian"
msgstr "ಸರ್ಬಿಯನ್"
-#: conf/global_settings.py:117
+#: conf/global_settings.py:118
msgid "Serbian Latin"
msgstr "ಸರ್ಬಿಯನ್ ಲ್ಯಾಟಿನ್"
-#: conf/global_settings.py:118
+#: conf/global_settings.py:119
msgid "Swedish"
msgstr "ಸ್ವೀಡಿಷ್"
-#: conf/global_settings.py:119
+#: conf/global_settings.py:120
msgid "Swahili"
msgstr ""
-#: conf/global_settings.py:120
+#: conf/global_settings.py:121
msgid "Tamil"
msgstr "ತಮಿಳು"
-#: conf/global_settings.py:121
+#: conf/global_settings.py:122
msgid "Telugu"
msgstr "ತೆಲುಗು"
-#: conf/global_settings.py:122
+#: conf/global_settings.py:123
msgid "Thai"
msgstr "ಥಾಯ್"
-#: conf/global_settings.py:123
+#: conf/global_settings.py:124
msgid "Turkish"
msgstr "ಟರ್ಕಿಶ್"
-#: conf/global_settings.py:124
+#: conf/global_settings.py:125
msgid "Tatar"
msgstr ""
-#: conf/global_settings.py:125
+#: conf/global_settings.py:126
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:127
msgid "Ukrainian"
msgstr "ಉಕ್ರೇನಿಯನ್"
-#: conf/global_settings.py:127
+#: conf/global_settings.py:128
msgid "Urdu"
msgstr "ಉರ್ದು"
-#: conf/global_settings.py:128
+#: conf/global_settings.py:129
msgid "Vietnamese"
msgstr "ವಿಯೆತ್ನಾಮೀಸ್"
-#: conf/global_settings.py:129
+#: conf/global_settings.py:130 conf/global_settings.py:131
msgid "Simplified Chinese"
msgstr "ಸರಳೀಕೃತ ಚೈನೀಸ್"
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132 conf/global_settings.py:133
msgid "Traditional Chinese"
msgstr "ಸಂಪ್ರದಾಯಿಕ ಚೈನೀಸ್ "
+#: contrib/sitemaps/apps.py:8
+msgid "Site Maps"
+msgstr ""
+
+#: contrib/staticfiles/apps.py:8
+msgid "Static Files"
+msgstr ""
+
+#: contrib/syndication/apps.py:8
+msgid "Syndication"
+msgstr ""
+
+#: contrib/webdesign/apps.py:8
+msgid "Web Design"
+msgstr ""
+
#: core/validators.py:21
msgid "Enter a valid value."
msgstr "ಸಿಂಧುವಾದ ಮೌಲ್ಯವನ್ನು ನಮೂದಿಸಿ."
-#: core/validators.py:53 forms/fields.py:650
+#: core/validators.py:77 forms/fields.py:675
msgid "Enter a valid URL."
msgstr "ಸರಿಯಾದ ಒಂದು URL ಅನ್ನು ನಮೂದಿಸಿ."
-#: core/validators.py:79
+#: core/validators.py:115
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:83
+#: core/validators.py:120
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131
+#: core/validators.py:185
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"ಅಕ್ಷರಗಳು, ಅಂಕೆಗಳು, ಅಡಿಗೆರೆಗಳು (ಅಂಡರ್ಸ್ಕೋರ್) ಹಾಗು ಅಡ್ಡಗೆರೆಗಳನ್ನು ಹೊಂದಿರುವ ಒಂದು "
"ಸರಿಯಾದ 'slug' ಅನ್ನು ನಮೂದಿಸಿ."
-#: core/validators.py:134 core/validators.py:153
+#: core/validators.py:188 core/validators.py:207
msgid "Enter a valid IPv4 address."
msgstr "ಒಂದು ಸರಿಯಾದ IPv4 ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ."
-#: core/validators.py:139 core/validators.py:154
+#: core/validators.py:193 core/validators.py:208
msgid "Enter a valid IPv6 address."
msgstr "ಮಾನ್ಯವಾದ IPv6 ವಿಳಾಸ ದಾಖಲಿಸಿ"
-#: core/validators.py:149 core/validators.py:152
+#: core/validators.py:203 core/validators.py:206
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "ಮಾನ್ಯವಾದ IPv4 ಅಥವಾ IPv6 ವಿಳಾಸ ದಾಖಲಿಸಿ"
-#: core/validators.py:175 db/models/fields/__init__.py:712
+#: core/validators.py:229 db/models/fields/__init__.py:1070
msgid "Enter only digits separated by commas."
msgstr "ಅಲ್ಪವಿರಾಮ(,)ಗಳಿಂದ ಬೇರ್ಪಟ್ಟ ಅಂಕೆಗಳನ್ನು ಮಾತ್ರ ಬರೆಯಿರಿ."
-#: core/validators.py:181
+#: core/validators.py:236
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"ಈ ಮೌಲ್ಯವು %(limit_value)s ಆಗಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ (ಇದು %(show_value)s ಆಗಿದೆ)."
-#: core/validators.py:196
+#: core/validators.py:255
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"ಈ ಮೌಲ್ಯವು %(limit_value)s ಕ್ಕಿಂತ ಕಡಿಮೆಯ ಅಥವ ಸಮನಾದ ಮೌಲ್ಯವಾಗಿದೆ ಎಂದು ಖಾತ್ರಿ "
"ಮಾಡಿಕೊಳ್ಳಿ."
-#: core/validators.py:202
+#: core/validators.py:262
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"ಈ ಮೌಲ್ಯವು %(limit_value)s ಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಅಥವ ಸಮನಾದ ಮೌಲ್ಯವಾಗಿದೆ ಎಂದು ಖಾತ್ರಿ "
"ಮಾಡಿಕೊಳ್ಳಿ."
-#: core/validators.py:210
+#: core/validators.py:271
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -408,7 +440,7 @@
"%(show_value)d)."
msgstr[0] ""
-#: core/validators.py:220
+#: core/validators.py:282
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -418,247 +450,254 @@
"%(show_value)d)."
msgstr[0] ""
-#: db/models/base.py:884
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-"%(field_name)s ಎನ್ನುವುದು %(date_field)s %(lookup)s ಗಾಗಿ ವಿಶಿಷ್ಟವಾಗಿರಬೇಕು."
-
-#: db/models/base.py:907 forms/models.py:686
+#: db/models/base.py:975 forms/models.py:718
msgid "and"
msgstr "ಮತ್ತು"
-#: db/models/base.py:908 db/models/fields/__init__.py:83
+#: db/models/base.py:977
#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
msgstr ""
-"ಈ %(field_label)s ಅನ್ನು ಹೊಂದಿರುವ ಒಂದು %(model_name)s ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ."
-#: db/models/fields/__init__.py:80
+#: db/models/fields/__init__.py:104
#, python-format
msgid "Value %(value)r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:81
+#: db/models/fields/__init__.py:105
msgid "This field cannot be null."
msgstr "ಈ ಅಂಶವನ್ನು ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ."
-#: db/models/fields/__init__.py:82
+#: db/models/fields/__init__.py:106
msgid "This field cannot be blank."
msgstr "ಈ ಸ್ಥಳವು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ."
-#: db/models/fields/__init__.py:89
+#: db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr ""
+"ಈ %(field_label)s ಅನ್ನು ಹೊಂದಿರುವ ಒಂದು %(model_name)s ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:116
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "ಕ್ಷೇತ್ರದ ಬಗೆ: %(field_type)s"
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
+#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573
msgid "Integer"
msgstr "ಪೂರ್ಣಾಂಕ"
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
+#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571
#, python-format
msgid "'%(value)s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:625
+#: db/models/fields/__init__.py:926
#, python-format
msgid "'%(value)s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:928
msgid "Boolean (Either True or False)"
msgstr "ಬೂಲಿಯನ್ (ಹೌದು ಅಥವ ಅಲ್ಲ)"
-#: db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:1004
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "ಪದಪುಂಜ (%(max_length)s ವರೆಗೆ)"
-#: db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:1065
msgid "Comma-separated integers"
msgstr "ಅಲ್ಪವಿರಾಮ(,) ದಿಂದ ಬೇರ್ಪಟ್ಟ ಪೂರ್ಣಸಂಖ್ಯೆಗಳು"
-#: db/models/fields/__init__.py:721
+#: db/models/fields/__init__.py:1080
#, python-format
msgid ""
"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
"format."
msgstr ""
-#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
+#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
"date."
msgstr ""
-#: db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:1085
msgid "Date (without time)"
msgstr "ದಿನಾಂಕ (ಸಮಯವಿಲ್ಲದೆ)"
-#: db/models/fields/__init__.py:815
+#: db/models/fields/__init__.py:1187
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:819
+#: db/models/fields/__init__.py:1191
#, python-format
msgid ""
"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
"[TZ]) but it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:823
+#: db/models/fields/__init__.py:1195
msgid "Date (with time)"
msgstr "ದಿನಾಂಕ (ಸಮಯದೊಂದಿಗೆ)"
-#: db/models/fields/__init__.py:921
+#: db/models/fields/__init__.py:1297
#, python-format
msgid "'%(value)s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:923
+#: db/models/fields/__init__.py:1299
msgid "Decimal number"
msgstr "ದಶಮಾನ ಸಂಖ್ಯೆ"
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1444
msgid "Email address"
msgstr ""
-#: db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:1470
msgid "File path"
msgstr "ಕಡತದ ಸ್ಥಾನಪಥ"
-#: db/models/fields/__init__.py:1029
+#: db/models/fields/__init__.py:1537
#, python-format
msgid "'%(value)s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1539
msgid "Floating point number"
msgstr "ತೇಲುವ-ಬಿಂದು ಸಂಖ್ಯೆ"
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1623
msgid "Big (8 byte) integer"
msgstr "ಬೃಹತ್ (೮ ಬೈಟ್) ಪೂರ್ಣ ಸಂಖ್ಯೆ"
-#: db/models/fields/__init__.py:1112
+#: db/models/fields/__init__.py:1638
msgid "IPv4 address"
msgstr "IPv4 ವಿಳಾಸ"
-#: db/models/fields/__init__.py:1128
+#: db/models/fields/__init__.py:1668
msgid "IP address"
msgstr "IP ವಿಳಾಸ"
-#: db/models/fields/__init__.py:1175
+#: db/models/fields/__init__.py:1747
#, python-format
msgid "'%(value)s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1177
+#: db/models/fields/__init__.py:1749
msgid "Boolean (Either True, False or None)"
msgstr "ಬೂಲಿಯನ್ (ನಿಜ, ಸುಳ್ಳು ಅಥವ ಯಾವುದೂ ಅಲ್ಲ ಇವುಗಳಲ್ಲಿ ಒಂದು)"
-#: db/models/fields/__init__.py:1229
+#: db/models/fields/__init__.py:1809
msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:1240
+#: db/models/fields/__init__.py:1821
msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:1252
+#: db/models/fields/__init__.py:1834
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1270
+#: db/models/fields/__init__.py:1863
msgid "Small integer"
msgstr ""
-#: db/models/fields/__init__.py:1276
+#: db/models/fields/__init__.py:1870
msgid "Text"
msgstr "ಪಠ್ಯ"
-#: db/models/fields/__init__.py:1294
+#: db/models/fields/__init__.py:1893
#, python-format
msgid ""
"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
"format."
msgstr ""
-#: db/models/fields/__init__.py:1296
+#: db/models/fields/__init__.py:1895
#, python-format
msgid ""
"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
"invalid time."
msgstr ""
-#: db/models/fields/__init__.py:1299
+#: db/models/fields/__init__.py:1898
msgid "Time"
msgstr "ಸಮಯ"
-#: db/models/fields/__init__.py:1368
+#: db/models/fields/__init__.py:1977
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1384
+#: db/models/fields/__init__.py:2000
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/files.py:217
+#: db/models/fields/files.py:225
msgid "File"
msgstr ""
-#: db/models/fields/files.py:324
+#: db/models/fields/files.py:375
msgid "Image"
msgstr ""
-#: db/models/fields/related.py:1128
+#: db/models/fields/related.py:1580
#, python-format
msgid "%(model)s instance with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:1130
+#: db/models/fields/related.py:1582
msgid "Foreign Key (type determined by related field)"
msgstr "ಬಾಹ್ಯ ಕೀಲಿ (ಸಂಬಂಧಿತ ಸ್ಥಳದಿಂದ ಪ್ರಕಾರವನ್ನು ನಿರ್ಧರಿಸಲಾಗುತ್ತದೆ)"
-#: db/models/fields/related.py:1271
+#: db/models/fields/related.py:1773
msgid "One-to-one relationship"
msgstr "ಒನ್-ಟು-ಒನ್ (ಪರಸ್ಪರ) ಸಂಬಂಧ"
-#: db/models/fields/related.py:1338
+#: db/models/fields/related.py:1843
msgid "Many-to-many relationship"
msgstr "ಮೆನಿ-ಟು-ಮೆನಿ (ಸಾರ್ವಜನಿಕ) ಸಂಬಂಧ"
-#: forms/fields.py:56
+#: forms/fields.py:55
msgid "This field is required."
msgstr "ಈ ಸ್ಥಳವು ಅಗತ್ಯವಿರುತ್ತದೆ."
-#: forms/fields.py:225
+#: forms/fields.py:236
msgid "Enter a whole number."
msgstr "ಪೂರ್ಣಾಂಕವೊಂದನ್ನು ನಮೂದಿಸಿ."
-#: forms/fields.py:266 forms/fields.py:294
+#: forms/fields.py:279 forms/fields.py:316
msgid "Enter a number."
msgstr "ಒಂದು ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ."
-#: forms/fields.py:296
+#: forms/fields.py:318
#, python-format
msgid "Ensure that there are no more than %(max)s digit in total."
msgid_plural "Ensure that there are no more than %(max)s digits in total."
msgstr[0] ""
-#: forms/fields.py:300
+#: forms/fields.py:322
#, python-format
msgid "Ensure that there are no more than %(max)s decimal place."
msgid_plural "Ensure that there are no more than %(max)s decimal places."
msgstr[0] ""
-#: forms/fields.py:304
+#: forms/fields.py:326
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -666,46 +705,46 @@
"Ensure that there are no more than %(max)s digits before the decimal point."
msgstr[0] ""
-#: forms/fields.py:415 forms/fields.py:1088
+#: forms/fields.py:437 forms/fields.py:1139
msgid "Enter a valid date."
msgstr "ಸರಿಯಾದ ದಿನಾಂಕವನ್ನು ನಮೂದಿಸಿ."
-#: forms/fields.py:439 forms/fields.py:1089
+#: forms/fields.py:461 forms/fields.py:1140
msgid "Enter a valid time."
msgstr "ಸರಿಯಾದ ಸಮಯವನ್ನು ನಮೂದಿಸಿ."
-#: forms/fields.py:461
+#: forms/fields.py:483
msgid "Enter a valid date/time."
msgstr "ಸರಿಯಾದ ದಿನಾಂಕ/ಸಮಯವನ್ನು ನಮೂದಿಸಿ."
-#: forms/fields.py:539
+#: forms/fields.py:564
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"ಯಾವದೇ ಕಡತವನ್ನೂ ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ. ನಮೂನೆಯ ಮೇಲಿನ ಸಂಕೇತೀಕರಣ (ಎನ್ಕೋಡಿಂಗ್) ಬಗೆಯನ್ನು "
"ಪರೀಕ್ಷಿಸಿ."
-#: forms/fields.py:540
+#: forms/fields.py:565
msgid "No file was submitted."
msgstr "ಯಾವದೇ ಕಡತವನ್ನೂ ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ."
-#: forms/fields.py:541
+#: forms/fields.py:566
msgid "The submitted file is empty."
msgstr "ಸಲ್ಲಿಸಲಾದ ಕಡತ ಖಾಲಿ ಇದೆ."
-#: forms/fields.py:543
+#: forms/fields.py:568
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr[0] ""
-#: forms/fields.py:546
+#: forms/fields.py:571
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"ದಯವಿಟ್ಟು ಕಡತವನ್ನು ಸಲ್ಲಿಸಿ ಅಥವ ಅಳಿಸುವ ಗುರುತುಚೌಕವನ್ನು ಗುರುತು ಹಾಕಿ, ಎರಡನ್ನೂ ಒಟ್ಟಿಗೆ "
"ಮಾಡಬೇಡಿ."
-#: forms/fields.py:607
+#: forms/fields.py:632
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -713,21 +752,25 @@
"ಸರಿಯಾದ ಚಿತ್ರವನ್ನು ಸೇರಿಸಿ. ನೀವು ಸೇರಿಸಿದ ಕಡತವು ಚಿತ್ರವೇ ಅಲ್ಲ ಅಥವಾ ಅದು ಒಂದು ಹಾಳಾದ "
"ಚಿತ್ರವಾಗಿದೆ. "
-#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
+#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "ಸರಿಯಾದ ಒಂದು ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ. %(value)s ಎನ್ನುವುದು ಲಭ್ಯವಿರುವ ಆಯ್ಕೆಗಳಲ್ಲಿ ಇಲ್ಲ."
-#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
+#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191
msgid "Enter a list of values."
msgstr "ಮೌಲ್ಯಗಳ ಒಂದು ಪಟ್ಟಿಯನ್ನು ನಮೂದಿಸಿ."
+#: forms/fields.py:988
+msgid "Enter a complete value."
+msgstr ""
+
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:90
+#: forms/forms.py:122
msgid ":"
msgstr ""
-#: forms/forms.py:159
+#: forms/forms.py:192
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
@@ -735,41 +778,47 @@
#. Translators: If found as last label character, these punctuation
#. characters will prevent the default label_suffix to be appended to the
#. label
-#: forms/forms.py:527
+#: forms/forms.py:620
msgid ":?.!"
msgstr ""
-#: forms/formsets.py:88
+#: forms/formsets.py:95
msgid "ManagementForm data is missing or has been tampered with"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:332
#, python-format
msgid "Please submit %d or fewer forms."
msgid_plural "Please submit %d or fewer forms."
msgstr[0] ""
-#: forms/formsets.py:350 forms/formsets.py:352
+#: forms/formsets.py:339
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+
+#: forms/formsets.py:367 forms/formsets.py:369
msgid "Order"
msgstr "ಕ್ರಮ"
-#: forms/formsets.py:354
+#: forms/formsets.py:371
msgid "Delete"
msgstr "ಅಳಿಸಿಹಾಕಿ"
-#: forms/models.py:680
+#: forms/models.py:712
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s ಗಾಗಿ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮಾಹಿತಿಯನ್ನು ಸರಿಪಡಿಸಿ."
-#: forms/models.py:684
+#: forms/models.py:716
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"%(field)s ಗಾಗಿ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮಾಹಿತಿಯನ್ನು ಸರಿಪಡಿಸಿ, ಇದರ ಮೌಲ್ಯವು "
"ವಿಶಿಷ್ಟವಾಗಿರಬೇಕು."
-#: forms/models.py:690
+#: forms/models.py:722
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -778,46 +827,46 @@
"%(field_name)s ಗಾಗಿ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮಾಹಿತಿಯನ್ನು ಸರಿಪಡಿಸಿ, %(date_field)s "
"ನಲ್ಲಿನ %(lookup)s ಗಾಗಿ ಇದರ ಮೌಲ್ಯವು ವಿಶಿಷ್ಟವಾಗಿರಬೇಕು."
-#: forms/models.py:698
+#: forms/models.py:730
msgid "Please correct the duplicate values below."
msgstr "ದಯವಿಟ್ಟು ಈ ಕೆಳಗೆ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮೌಲ್ಯವನ್ನು ಸರಿಪಡಿಸಿ."
-#: forms/models.py:986
+#: forms/models.py:1028
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "ಸಾಲಿನೊಳಗಿನ ಪ್ರಾಥಮಿಕ ಕೀಲಿಯು ಮೂಲ ಇನ್ಸ್ಟನ್ಸ್ ಪ್ರಾಥಮಿಕ ಕೀಲಿಗೆ ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ."
-#: forms/models.py:1050
+#: forms/models.py:1094
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "ಸರಿಯಾದ ಒಂದು ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ. ಆ ಆಯ್ಕೆಯು ಲಭ್ಯವಿರುವ ಆಯ್ಕೆಗಳಲ್ಲಿ ಇಲ್ಲ."
-#: forms/models.py:1147
+#: forms/models.py:1194
#, python-format
msgid "\"%(pk)s\" is not a valid value for a primary key."
msgstr ""
-#: forms/models.py:1158
+#: forms/models.py:1205
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚನ್ನು ಆಯ್ದುಕೊಳ್ಳಲು ಮ್ಯಾಕ್ ಗಣಕದಲ್ಲಿನ \"ಕಂಟ್ರೋಲ್\", ಅಥವಾ \"ಕಮ್ಯಾಂಡ್\" ಅನ್ನು "
"ಒತ್ತಿ ಹಿಡಿಯಿರಿ."
-#: forms/util.py:83
+#: forms/utils.py:148
#, python-format
msgid ""
"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:350
msgid "Currently"
msgstr "ಪ್ರಸಕ್ತ"
-#: forms/widgets.py:327
+#: forms/widgets.py:351
msgid "Change"
msgstr "ಬದಲಾವಣೆ"
-#: forms/widgets.py:328
+#: forms/widgets.py:352
msgid "Clear"
msgstr "ಮುಕ್ತಗೊಳಿಸು"
@@ -833,62 +882,62 @@
msgid "No"
msgstr "ಇಲ್ಲ"
-#: template/defaultfilters.py:784
+#: template/defaultfilters.py:855
msgid "yes,no,maybe"
msgstr "ಹೌದು,ಇಲ್ಲ,ಇರಬಹುದು"
-#: template/defaultfilters.py:812 template/defaultfilters.py:824
+#: template/defaultfilters.py:884 template/defaultfilters.py:896
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d ಬೈಟ್ಗಳು"
-#: template/defaultfilters.py:826
+#: template/defaultfilters.py:898
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:828
+#: template/defaultfilters.py:900
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:830
+#: template/defaultfilters.py:902
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:904
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:906
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:59
msgid "p.m."
msgstr "ಅಪರಾಹ್ನ"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:60
msgid "a.m."
msgstr "ಪೂರ್ವಾಹ್ನ"
-#: utils/dateformat.py:53
+#: utils/dateformat.py:65
msgid "PM"
msgstr "ಅಪರಾಹ್ನ"
-#: utils/dateformat.py:54
+#: utils/dateformat.py:66
msgid "AM"
msgstr "ಪೂರ್ವಾಹ್ನ"
-#: utils/dateformat.py:103
+#: utils/dateformat.py:149
msgid "midnight"
msgstr "ಮಧ್ಯರಾತ್ರಿ"
-#: utils/dateformat.py:105
+#: utils/dateformat.py:151
msgid "noon"
msgstr "ಮಧ್ಯಾಹ್ನ"
@@ -1164,111 +1213,127 @@
msgid "December"
msgstr "ಡಿಸೆಂಬರ್"
-#: utils/image.py:105
-#, python-format
-msgid "Neither Pillow nor PIL could be imported: %s"
-msgstr ""
-
-#: utils/image.py:127
-#, python-format
-msgid "The '_imaging' module for the PIL could not be imported: %s"
-msgstr ""
-
-#: utils/ipv6.py:9
+#: utils/ipv6.py:10
msgid "This is not a valid IPv6 address."
msgstr ""
-#: utils/text.py:69
+#: utils/text.py:76
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:224
+#: utils/text.py:245
msgid "or"
msgstr "ಅಥವ"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:241 utils/timesince.py:56
+#: utils/text.py:264 utils/timesince.py:57
msgid ", "
msgstr ", "
-#: utils/timesince.py:24
+#: utils/timesince.py:25
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:26
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:27
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: utils/timesince.py:27
+#: utils/timesince.py:28
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: utils/timesince.py:28
+#: utils/timesince.py:29
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: utils/timesince.py:29
+#: utils/timesince.py:30
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:46
msgid "0 minutes"
msgstr ""
-#: views/static.py:56
-msgid "Directory indexes are not allowed here."
+#: views/csrf.py:105
+msgid "Forbidden"
msgstr ""
-#: views/static.py:58
-#, python-format
-msgid "\"%(path)s\" does not exist"
+#: views/csrf.py:106
+msgid "CSRF verification failed. Request aborted."
msgstr ""
-#: views/static.py:99
-#, python-format
-msgid "Index of %(directory)s"
+#: views/csrf.py:110
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:115
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: views/csrf.py:120
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: views/csrf.py:125
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: views/csrf.py:129
+msgid "More information is available with DEBUG=True."
msgstr ""
-#: views/generic/dates.py:42
+#: views/generic/dates.py:43
msgid "No year specified"
msgstr "ಯಾವುದೆ ವರ್ಷವನ್ನು ಸೂಚಿಲಾಗಿಲ್ಲ"
-#: views/generic/dates.py:98
+#: views/generic/dates.py:99
msgid "No month specified"
msgstr "ಯಾವುದೆ ತಿಂಗಳನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
-#: views/generic/dates.py:157
+#: views/generic/dates.py:158
msgid "No day specified"
msgstr "ಯಾವುದೆ ದಿನವನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
-#: views/generic/dates.py:213
+#: views/generic/dates.py:214
msgid "No week specified"
msgstr "ಯಾವುದೆ ವಾರವನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
-#: views/generic/dates.py:368 views/generic/dates.py:396
+#: views/generic/dates.py:369 views/generic/dates.py:397
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "ಯಾವುದೆ %(verbose_name_plural)s ಲಭ್ಯವಿಲ್ಲ"
-#: views/generic/dates.py:649
+#: views/generic/dates.py:650
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1277,7 +1342,7 @@
"ಭವಿಷ್ಯದ %(verbose_name_plural)s ಲಭ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ %(class_name)s.allow_future "
"ಎನ್ನುವುದು ಅಸತ್ಯವಾಗಿದೆ (ಫಾಲ್ಸ್) ಆಗಿದೆ."
-#: views/generic/dates.py:681
+#: views/generic/dates.py:682
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1288,17 +1353,31 @@
msgid "No %(verbose_name)s found matching the query"
msgstr "ಮನವಿಗೆ ತಾಳೆಯಾಗುವ ಯಾವುದೆ %(verbose_name)s ಕಂಡುಬಂದಿಲ್ಲ"
-#: views/generic/list.py:54
+#: views/generic/list.py:62
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "ಪುಟವು 'ಕೊನೆಯ'ದಲ್ಲ, ಅಥವ ಅದನ್ನು ಒಂದು int ಆಗಿ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
-#: views/generic/list.py:59
+#: views/generic/list.py:67
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:150
+#: views/generic/list.py:158
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
"ಖಾಲಿ ಪಟ್ಟಿ ಹಾಗು '%(class_name)s.allow_empty' ಎನ್ನುವುದು ಅಸತ್ಯವಾಗಿದೆ (ಫಾಲ್ಸ್)."
+
+#: views/static.py:54
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:56
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:97
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
diff -Nru python-django-1.6.6/django/conf/locale/ko/formats.py python-django-1.7.4/django/conf/locale/ko/formats.py
--- python-django-1.6.6/django/conf/locale/ko/formats.py 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ko/formats.py 2015-01-27 17:12:29.000000000 +0000
@@ -18,7 +18,7 @@
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = (
- '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
+ '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
# '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
# '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
# '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/ko/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ko/LC_MESSAGES/django.mo differ
diff -Nru python-django-1.6.6/django/conf/locale/ko/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ko/LC_MESSAGES/django.po
--- python-django-1.6.6/django/conf/locale/ko/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000
+++ python-django-1.7.4/django/conf/locale/ko/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000
@@ -1,15 +1,18 @@
# This file is distributed under the same license as the Django package.
#
# Translators:
+# BJ Jang , 2014
# Jaehong Kim , 2011
# Jannis Leidel , 2011
+# Jeong Seongtae